gorden 6 miesięcy temu
rodzic
commit
715491cb8a

+ 2 - 2
app/admin/controller/coupon/CouponController.php

@@ -252,7 +252,7 @@ class CouponController extends Curd
     {
         $params = $request->post();
         $data = $this->inputFilter($params);
-        $data['coupon_id'] = "CU" . str_pad(SysSerial::getSerial(), 6, '0') . random_string(6, 'up');
+        $data['coupon_id'] = "CU" . date("ymdH") . random_string(6, 'up');
         if (!empty($params['coupon_use_time']) && $params['coupon_use_time'] == 'date') {
             $data['coupon_validdate_day'] = 0;
             $data['coupon_validdate_begin'] = date("Y-m-d H:i:s", strtotime($data['coupon_validdate_begin']));
@@ -755,7 +755,7 @@ class CouponController extends Curd
     {
         for ($i = 0; $i < intval($nbr); $i++) {
             CouponDetail::insert([
-                'coupon_detail_id' => 'CUDT' . str_pad(SysSerial::getSerial(), 6, '0') . random_string(6, 'up'),
+                'coupon_detail_id' => 'CUDT' . date("ymdH") . random_string(6, 'up'),
                 'join_detail_coupon_id' => $couponId,
                 'coupon_detail_status' => $couponStatus == 'ACTIVED' ? 'PENDING' : 'INIT',
                 'coupon_detail_addtimes' => time()

+ 1 - 1
app/admin/controller/customer/IndexController.php

@@ -164,7 +164,7 @@ class IndexController extends Curd
         Db::beginTransaction();
 
         try {
-            $memberId = "ME" . str_pad(SysSerial::getSerial(), 16, "0", STR_PAD_LEFT) . random_string(6, 'up');
+            $memberId = "ME" . date("ymdH") . random_string(6, 'up');
             $member = [
                 'member_id' => $memberId,
                 'member_is_owner' => 'N',

+ 2 - 2
app/admin/controller/member/QuotaController.php

@@ -311,7 +311,7 @@ class QuotaController extends Curd
             } else {
                 $quota = $quotas[0];
                 for ($i = 0; $i < $nbr; $i++) {
-                    $quota['member_quota_id'] = 'MQ' . date('YmdHis') . random_string(6, 'up');
+                    $quota['member_quota_id'] = 'MQ' . date('ymdH') . random_string(6, 'up');
                     $quota['member_quota_status'] = 'USED';
                     $quota['member_quota_used_json'] = json_encode($writeOffData);
                     $quota['member_quota_addtimes'] = strtotime($quota['member_quota_addtimes']);
@@ -406,7 +406,7 @@ class QuotaController extends Curd
                 } else {
                     $quota = $quotas[0];
                     for ($i = 0; $i < $nbr; $i++) {
-                        $quota['member_quota_id'] = 'MQ' . date('YmdHis') . random_string(6, 'up');
+                        $quota['member_quota_id'] = 'MQ' . date('ymdH') . random_string(6, 'up');
                         $quota['member_quota_status'] = 'USED';
                         $quota['member_quota_used_json'] = json_encode($writeOffData);
                         $quota['member_quota_addtimes'] = strtotime($quota['member_quota_addtimes']);

+ 1 - 1
app/admin/controller/member/RoleController.php

@@ -93,7 +93,7 @@ class RoleController extends Curd
     protected function insertInput(Request $request): array
     {
         $data = $this->inputFilter($request->post());
-        $data['member_role_id'] = "MR" . str_pad(SysSerial::getSerial(), 16, '0', STR_PAD_LEFT) . random_string(6, 'up');
+        $data['member_role_id'] = "MR" . date('ymdH') . random_string(6, 'up');
 
         $data['member_role_rule_json'] = json_encode([
             'pricing' => $request->post('join_member_role_rule_pricing_id',''),

+ 1 - 1
app/admin/controller/member/RuleAddedController.php

@@ -97,7 +97,7 @@ class RuleAddedController extends Curd
     protected function insertInput(Request $request): array
     {
         $data = $this->inputFilter($request->post());
-        $data['rule_added_id'] = "RA" . str_pad(SysSerial::getSerial(), 16, '0', STR_PAD_LEFT) . random_string(6, 'up');
+        $data['rule_added_id'] = "RA" . date("ymdH") . random_string(6, 'up');
 
         return $data;
     }

+ 1 - 1
app/admin/controller/member/RulePricingController.php

@@ -54,7 +54,7 @@ class RulePricingController extends Curd
     protected function insertInput(Request $request): array
     {
         $data = $this->inputFilter($request->post());
-        $data['rule_pricing_id'] = "RP" . str_pad(SysSerial::getSerial(), 16, '0', STR_PAD_LEFT) . random_string(6, 'up');
+        $data['rule_pricing_id'] = "RP" . date("ymdH") . random_string(6, 'up');
         $data['rulr_priceing_nbr'] = $data['rulr_priceing_nbr'] / 100;
 //        if (!empty($data['rule_pricing_goods_json'])) {
 //            $data['rule_pricing_goods_json'] = json_encode(explode(',', $data['rule_pricing_goods_json']));

+ 3 - 3
app/admin/controller/order/KangyangCityController.php

@@ -224,7 +224,7 @@ class KangyangCityController extends Curd{
                 if (Member::where('member_mobile', $params['mobile'])->exists()) {
                     throw new BusinessException('会员已存在');
                 }
-                $params['join_order_member_id'] = $params['member_id'] = 'MR' . date('YmdHis') . random_string(6, 'up');
+                $params['join_order_member_id'] = $params['member_id'] = 'MR' . date('ymdH') . random_string(6, 'up');
                 // 创建会员
                 MemberService::createMember($params);
             } else if (empty($params['join_order_member_id']) && empty($params['mobile'])) {
@@ -235,8 +235,8 @@ class KangyangCityController extends Curd{
             }
 
             $qrcodePayAmount = 0;
-            $params['orderId'] = 'OD' . date('YmdHis') . random_string(6, 'up');
-            $params['orderGroupId'] = 'OD' . date('YmdHis') . random_string(6, 'up');
+            $params['orderId'] = 'OD' . date('ymdH') . random_string(6, 'up');
+            $params['orderGroupId'] = 'OD' . date('ymdH') . random_string(6, 'up');
 
             $systemStatus = 'SENDING';  // 待发货
             // 立即结算

+ 2 - 2
app/admin/controller/order/PayDetailController.php

@@ -317,8 +317,8 @@ class PayDetailController extends Curd
                 $data['pay_amount'] = $goods->goods_sales_price;
             }
 
-            $orderId = "OD" . date("YmdHis") . random_string(6, 'up');
-            $orderGroupId = "OD" . date("YmdHis") . random_string(6, 'up');
+            $orderId = "OD" . date('ymdH') . random_string(6, 'up');
+            $orderGroupId = "OD" . date('ymdH') . random_string(6, 'up');
             $orderData = [
                 'order_id' => $orderId,
                 'order_groupby' => $orderGroupId,

+ 23 - 23
app/admin/controller/order/WholeController.php

@@ -1176,11 +1176,11 @@ class WholeController extends Curd
                 foreach ($params['goodsContentList'] as $goods) {
                     $params['join_sheet_goods_id'] = $goods['goods_id'];
                     if (isset($goods['goods_classify']) && in_array($goods['goods_classify'], ['SERVICE', 'CHNMED', 'CHNNCD'])) {
-                        $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
+                        $params['benefitId'] = 'BF' . date('ymdH') . random_string(6, 'up');
                         $params['order_sheet_num'] = $goods['nbr'];
                         // 预约表
                         for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
-                            $params['appointmentId'] = 'AP' . date('YmdHis') . random_string(6, 'up');
+                            $params['appointmentId'] = 'AP' . date('ymdH') . random_string(6, 'up');
                             // 入预约记录
                             $this->insertAppointment($params, $writeOffDate, $applyData);
                         }
@@ -1200,10 +1200,10 @@ class WholeController extends Curd
                         foreach ($components as $component) {
                             $componentJson = json_decode($component['goods_component_json'], true);
                             $params['join_sheet_goods_sku_id'] = $componentJson['sku_id'];
-                            $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
+                            $params['benefitId'] = 'BF' . date('ymdH') . random_string(6, 'up');
                             $params['order_sheet_num'] = $goods['nbr'] * $componentJson['nbr'];
                             for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
-                                $params['appointmentId'] = 'AP' . date('YmdHis') . random_string(8, 'up');
+                                $params['appointmentId'] = 'AP' . date('ymdH') . random_string(6, 'up');
                                 // 入预约记录
                                 $this->insertAppointment($params, $writeOffDate);
                             }
@@ -1621,11 +1621,11 @@ class WholeController extends Curd
                 foreach ($params['goodsContentList'] as $goods) {
                     $params['join_sheet_goods_id'] = $goods['goods_id'];
                     if (isset($goods['goods_classify']) && in_array($goods['goods_classify'], ['SERVICE', 'CHNMED', 'CHNNCD'])) {
-                        $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
+                        $params['benefitId'] = 'BF' . date('ymdH') . random_string(6, 'up');
                         $params['order_sheet_num'] = $goods['nbr'];
                         // 预约表
                         for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
-                            $params['appointmentId'] = 'AP' . date('YmdHis') . random_string(6, 'up');
+                            $params['appointmentId'] = 'AP' . date('ymdH') . random_string(6, 'up');
                             // 入预约记录
                             $this->insertAppointment($params, $writeOffDate, $applyData);
                         }
@@ -1645,10 +1645,10 @@ class WholeController extends Curd
                         foreach ($components as $component) {
                             $componentJson = json_decode($component['goods_component_json'], true);
                             $params['join_sheet_goods_sku_id'] = $componentJson['sku_id'];
-                            $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
+                            $params['benefitId'] = 'BF' . date('ymdH') . random_string(6, 'up');
                             $params['order_sheet_num'] = $goods['nbr'] * $componentJson['nbr'];
                             for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
-                                $params['appointmentId'] = 'AP' . date('YmdHis') . random_string(8, 'up');
+                                $params['appointmentId'] = 'AP' . date('ymdH') . random_string(6, 'up');
                                 // 入预约记录
                                 $this->insertAppointment($params, $writeOffDate);
                             }
@@ -1935,7 +1935,7 @@ class WholeController extends Curd
                 if (Member::where('member_mobile', $params['mobile'])->exists()) {
                     throw new BusinessException('会员已存在');
                 }
-                $params['join_order_member_id'] = $params['member_id'] = 'MR' . date('YmdHis') . random_string(6, 'up');
+                $params['join_order_member_id'] = $params['member_id'] = 'MR' . date('ymdH') . random_string(6, 'up');
                 // 创建会员
                 MemberService::createMember($params);
             } else if (empty($params['join_order_member_id']) && empty($params['mobile'])) {
@@ -1946,8 +1946,8 @@ class WholeController extends Curd
             }
 
             $qrcodePayAmount = 0;
-            $params['orderId'] = 'OD' . date('YmdHis') . random_string(6, 'up');
-            $params['orderGroupId'] = 'OD' . date('YmdHis') . random_string(6, 'up');
+            $params['orderId'] = 'OD' . date('ymdH') . random_string(6, 'up');
+            $params['orderGroupId'] = 'OD' . date('ymdH') . random_string(6, 'up');
 
             $systemStatus = 'SENDING';  // 待发货
             // 立即结算
@@ -2300,13 +2300,13 @@ class WholeController extends Curd
                 foreach ($params['goodsContentList'] as $goods) {
                     $params['join_sheet_goods_id'] = $goods['goods_id'];
                     if (isset($goods['goods_classify']) && in_array($goods['goods_classify'], ['SERVICE', 'CHNMED', 'CHNNCD'])) {
-                        $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
+                        $params['benefitId'] = 'BF' . date('ymdH') . random_string(6, 'up');
                         $params['join_sheet_goods_sku_id'] = $goods['sku_id'];
                         $params['goods_id'] = $goods['goods_id'];
                         $params['order_sheet_num'] = $goods['nbr'];
                         // 预约表
                         for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
-                            $params['appointmentId'] = 'AP' . date('YmdHis') . random_string(6, 'up');
+                            $params['appointmentId'] = 'AP' . date('ymdH') . random_string(6, 'up');
                             // 入预约记录
                             $this->insertAppointment($params, $writeOffDate, $applyData);
                         }
@@ -2326,10 +2326,10 @@ class WholeController extends Curd
                         foreach ($components as $component) {
                             $componentJson = json_decode($component['goods_component_json'], true);
                             $params['join_sheet_goods_sku_id'] = $componentJson['sku_id'];
-                            $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
+                            $params['benefitId'] = 'BF' . date('ymdH') . random_string(6, 'up');
                             $params['order_sheet_num'] = $goods['nbr'] * $componentJson['nbr'];
                             for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
-                                $params['appointmentId'] = 'AP' . date('YmdHis') . random_string(8, 'up');
+                                $params['appointmentId'] = 'AP' . date('ymdH') . random_string(6, 'up');
                                 // 入预约记录
                                 $this->insertAppointment($params, $writeOffDate);
                             }
@@ -2511,7 +2511,7 @@ class WholeController extends Curd
                 if (Member::where('member_mobile', $params['mobile'])->exists()) {
                     throw new BusinessException("会员已存在");
                 }
-                $params['join_order_member_id'] = $params['member_id'] = 'MR' . date('YmdHis') . random_string(6, 'up');
+                $params['join_order_member_id'] = $params['member_id'] = 'MR' . date('ymdH') . random_string(6, 'up');
                 // 创建会员
                 MemberService::createMember($params);
             } else if (empty($params['join_order_member_id']) && empty($params['mobile'])) {
@@ -2522,9 +2522,9 @@ class WholeController extends Curd
             }
 
             $qrcodePayAmount = 0;
-            $params['orderId'] = 'OD' . date('YmdHis') . random_string(6, 'up');
-            $params['orderGroupId'] = 'OD' . date('YmdHis') . random_string(6, 'up');
-            $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
+            $params['orderId'] = 'OD' . date('ymdH') . random_string(6, 'up');
+            $params['orderGroupId'] = 'OD' . date('ymdH') . random_string(6, 'up');
+            $params['benefitId'] = 'BF' . date('ymdH') . random_string(6, 'up');
 
             $systemStatus = 'SENDING';  // 待发货
             // 立即结算
@@ -2784,13 +2784,13 @@ class WholeController extends Curd
                 foreach ($params['goodsContentList'] as $goods) {
                     $params['join_sheet_goods_id'] = $goods['goods_id'];
                     if (isset($goods['goods_classify']) && in_array($goods['goods_classify'], ['SERVICE', 'CHNMED', 'CHNNCD'])) {
-                        $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
+                        $params['benefitId'] = 'BF' . date('ymdH') . random_string(6, 'up');
                         $params['join_sheet_goods_sku_id'] = $goods['sku_id'];
                         $params['goods_id'] = $goods['goods_id'];
                         $params['order_sheet_num'] = $goods['nbr'];
                         // 预约表
                         for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
-                            $params['appointmentId'] = 'AP' . date('YmdHis') . random_string(6, 'up');
+                            $params['appointmentId'] = 'AP' . date('ymdH') . random_string(6, 'up');
                             // 入预约记录
                             $this->insertAppointment($params, $writeOffDate, $applyData);
                         }
@@ -2810,10 +2810,10 @@ class WholeController extends Curd
                         foreach ($components as $component) {
                             $componentJson = json_decode($component['goods_component_json'], true);
                             $params['join_sheet_goods_sku_id'] = $componentJson['sku_id'];
-                            $params['benefitId'] = 'BF' . date('YmdHis') . random_string(6, 'up');
+                            $params['benefitId'] = 'BF' . date('ymdH') . random_string(6, 'up');
                             $params['order_sheet_num'] = $goods['nbr'] * $componentJson['nbr'];
                             for ($i = 0; $i < intval($params['order_sheet_num']); $i++) {
-                                $params['appointmentId'] = 'AP' . date('YmdHis') . random_string(8, 'up');
+                                $params['appointmentId'] = 'AP' . date('ymdH') . random_string(6, 'up');
                                 // 入预约记录
                                 $this->insertAppointment($params, $writeOffDate);
                             }

+ 1 - 1
app/admin/controller/sys_manage/ApiController.php

@@ -31,7 +31,7 @@ class ApiController extends Curd
     protected function insertInput(Request $request): array
     {
         $data = $this->inputFilter($request->post());
-        $data['api_id'] = "AP" . str_pad(SysSerial::getSerial(), 16, '0') . random_string(8);
+        $data['api_id'] = "AP" . date('ymdH') . random_string(6, 'up');
         $data['api_extend_json'] = $data['api_extend_json'] ?? '{}';
         $data['api_request_json'] = $data['api_request_json'] ?? '{}';
         $data['api_response_json'] = $data['api_response_json'] ?? '{}';

+ 1 - 1
app/admin/service/coupon/CouponDetailService.php

@@ -21,7 +21,7 @@ class CouponDetailService
     {
         try {
             CouponDetail::insert([
-                'coupon_detail_id' => 'CUDT' . str_pad(SysSerial::getSerial(), 6, '0') . random_string(6, 'up'),
+                'coupon_detail_id' => 'CUDT' . date("ymdH") . random_string(6, 'up'),
                 'join_detail_coupon_id' => $params['coupon_id'],
                 'join_coupon_detail_member_id' => $params['member_id'],
                 'coupon_detail_status' => 'ACTIVED',

+ 3 - 3
app/admin/service/goods/GoodsService.php

@@ -1107,7 +1107,7 @@ class GoodsService
     {
         Db::beginTransaction();
         try {
-            $params['goods_id'] = "GD" . sprintf('%016d', SysSerial::getSerial()) . random_string(6, 'up');
+            $params['goods_id'] = "GD" . date('ymdH') . random_string(6, 'up');
             // 主表
             self::mainInsert($params);
             // 商品详情表
@@ -1155,7 +1155,7 @@ class GoodsService
         try {
             Db::beginTransaction();
             $goods = new Goods();
-            $goods->goods_id = "GD" . date('YmdHis') . random_string(6, 'up');
+            $goods->goods_id = "GD" . date('ymdH') . random_string(6, 'up');
             $goods->join_goods_category_id = 59;
             $goods->goods_classify = 'RECHARGE';
             $goods->goods_status = $params['goods_status'];
@@ -1231,7 +1231,7 @@ class GoodsService
     {
         Db::beginTransaction();
         try {
-            $params['goods_id'] = "GD" . sprintf('%016d', SysSerial::getSerial()) . random_string(6, 'up');
+            $params['goods_id'] = "GD" . date('ymdH') . random_string(6, 'up');
             // 主表
             self::mainInsert($params);
             // 商品详情表

+ 1 - 1
app/admin/service/member/MemberService.php

@@ -1236,7 +1236,7 @@ class MemberService
     {
         $id = SysSerial::getSerial();
 
-        return "MR" . str_pad($id, 16, "0", STR_PAD_LEFT) . random_string(6, 'up');
+        return "MR" . date('ymdH') . random_string(6, 'up');
     }
 
     public static function getMemberName($mobile, $certName, $nickname)

+ 1 - 1
app/admin/service/notify/RechargeService.php

@@ -246,7 +246,7 @@ class RechargeService
     private static function doSaveMemberQuota($memberId, $component, $nbr)
     {
         $model = new MemberQuota();
-        $model->member_quota_id = 'MQ' . date('YmdHis') . random_string(6, 'up');
+        $model->member_quota_id = 'MQ' . date('ymdH') . random_string(6, 'up');
         $model->join_quota_member_id = $memberId;
         $model->join_member_rule_added_component_id = $component['rule_added_component_id'];
         $model->member_quota_status = 'PENDING';

+ 7 - 7
app/admin/service/order/AppointmentService.php

@@ -209,8 +209,8 @@ class AppointmentService
             $applyJson = json_decode($appointment->appointment_apply_json,true);
             $goods = Goods::where('goods_id',$appointment->join_appointment_goods_id)->first();
             $sku = GoodsSku::where('goods_sku_id',$appointment->join_appointment_goods_sku_id)->where('goods_sku_status','ON')->first();
-            $orderId = 'OD' . date('YmdHis') . random_string(6, 'up');
-            $groupBy = 'OD' . date('YmdHis') . random_string(6, 'up');
+            $orderId = 'OD' . date('ymdH') . random_string(6, 'up');
+            $groupBy = 'OD' . date('ymdH') . random_string(6, 'up');
             $order = [
                 'order_id' => $orderId,
                 'order_groupby' => $groupBy,
@@ -293,12 +293,12 @@ class AppointmentService
                     Db::rollBack();
                     return json_fail('会员已存在,请勿重复创建');
                 }
-                $memberId = 'MR' . date('YmdHis') . random_string(6, 'up');
+                $memberId = 'MR' . date('ymdH') . random_string(6, 'up');
                 $params['join_appointment_member_id'] = $params['member_id'] = $memberId;
                 // 创建会员
                 MemberService::createMember($params);
             }
-            $appointmentId = "AP" . date('YmdHis') . random_string(6, 'up');
+            $appointmentId = "AP" . date('ymdH') . random_string(6, 'up');
             $data = [
                 'appointment_id' => $appointmentId,
                 'join_appointment_member_id' => $params['join_appointment_member_id'] ?? '',
@@ -453,8 +453,8 @@ class AppointmentService
             // 如果服务结束,没有生成过订单,生成订单
             if ($params['appointment_status'] == 'DONE' && empty($appointment->join_appointment_order_id) && $params['settlement_mode'] != 'QUOTA') {
                 $sku = GoodsSku::find($params['join_appointment_goods_sku_id']);    
-                $orderId = 'OD' . date('YmdHis') . random_string(6, 'up');
-                $groupBy = 'OD' . date('YmdHis') . random_string(6, 'up');
+                $orderId = 'OD' . date('ymdH') . random_string(6, 'up');
+                $groupBy = 'OD' . date('ymdH') . random_string(6, 'up');
                 $order = [
                     'order_id' => $orderId,
                     'order_groupby' => $groupBy,
@@ -567,7 +567,7 @@ class AppointmentService
                 }
 
                 // 回写权益表
-                $benefitId = 'BF'.date('YmdHis').random_string(6,'up');
+                $benefitId = 'BF'.date('ymdH').random_string(6,'up');
                 $benefitData = [
                     'member_benefit_id'=>$benefitId,
                     'join_benefit_member_id'=>$params['join_appointment_member_id'],

+ 2 - 2
app/admin/service/sys_manage/UserService.php

@@ -278,8 +278,8 @@ class UserService
 
     public static function generateUserId()
     {
-        $random = random_string(8,'up');
+        $random = random_string(6,'up');
 
-        return 'UR' . date('YmdHis') . $random;
+        return 'UR' . date('ymdH') . $random;
     }
 }

+ 1 - 1
app/event/order/KangyangCityEvent.php

@@ -74,7 +74,7 @@ class KangyangCityEvent
                     $num = $coupon['num'];
                     for ($i = 0; $i < $num; $i++) {
                         CouponDetail::insert([
-                            'coupon_detail_id' => 'CUDT' . str_pad(SysSerial::getSerial(), 8, "0", STR_PAD_LEFT) . random_string(6, 'up'),
+                            'coupon_detail_id' => 'CUDT' . date("ymdH") . random_string(6, 'up'),
                             'join_detail_coupon_id' => $key,
                             'join_coupon_detail_member_id' => $params['member_id'],
                             'coupon_detail_status' => 'ACTIVED',