失信人员优化

app-hd/controllers/LlEventController.php

@@ -15,11 +15,10 @@ class LlEventController extends BaseController
     {
         $get = Yii::$app->request->get();
         $requestType = $get['requestType'] ?? '';
+        $where = [];
         if ($requestType == 'my') {
             $shopId = $this->shopId;
-            $where = ['launchShopId' => $shopId];
-        } else {
-            $where = [];
+            $where['launchShopId'] = $shopId;
         }
         $respond = LlEventClass::getEventList($where);
         util::success($respond);

biz-hd/ll/classes/LlEventClass.php

@@ -28,6 +28,9 @@ class LlEventClass extends BaseClass
         $date = $data['date']??'';
         $no = $data['no']??'';
         $intro = $data['intro']??'';
+        $shopId = $shop->id??0;
+        $shopMobile= $shop->mobile??0;
+        $launchName = $shop->shopName == '首店' ? $shop->merchantName : $shop->merchantName.' '.$shop->shopName;
         $add = [
             'name'=>$name,
             'wx'=>$wx,
@@ -37,6 +40,9 @@ class LlEventClass extends BaseClass
             'no'=>$no,
             'prove'=>$prove,
             'intro'=>$intro,
+            'launchShopId'=>$shopId,
+            'launchMobile'=>$shopMobile,
+            'launchName'=>$launchName,
             'status'=>1,
         ];
         $event = self::add($add,true);
@@ -49,10 +55,9 @@ class LlEventClass extends BaseClass
             'baseId'=>0,
             'breakNum'=>1,
             'breakAmount'=>$amount,
-            'firstDate'=>$date,
-            'lastDate'=>$date,
+            'date'=>$date,
         ];
-        $user = LlUserClass::replaceUser($userData,$shop);
+        LlUserClass::replaceUser($userData,$shop);
         return $event;
     }
 

biz-hd/ll/classes/LlUserClass.php

@@ -19,28 +19,28 @@ class LlUserClass extends BaseClass
         return $data;
     }
 
-    public static function replaceUser($user,$shop)
+    public static function replaceUser($userInfo,$shop)
     {
         $shopId = $shop->id??'';
         $shopMobile = $shop->mobile??'';
         $shopFullName = $shop->merchantName.' '.$shop->shopName;
         $userId = 0;
         $baseId = 0;
-        $date = $user['date'] ?? '';
-        $name = $user['name'] ?? '';
-        $no = $user['no'] ?? '';
+        $thatDate = $userInfo['date'] ?? '';
+        $name = $userInfo['name'] ?? '';
+        $no = $userInfo['no'] ?? '';
         $noRes = LlNoClass::getByCondition(['no' => $no], true);
         if (!empty($noRes)) {
             $userId = $noRes->userId ?? 0;
             $baseId = $noRes->baseId ?? 0;
         }
-        $mobile = $user['mobile'] ?? '';
+        $mobile = $userInfo['mobile'] ?? '';
         $mobileRes = LlMobileClass::getByCondition(['mobile' => $mobile], true);
         if (!empty($mobileRes) && empty($userId)) {
             $userId = $mobileRes->userId ?? 0;
             $baseId = $mobileRes->baseId ?? 0;
         }
-        $wx = $user['wx'] ?? '';
+        $wx = $userInfo['wx'] ?? '';
         $wxRes = LlWxClass::getByCondition(['wx' => $wx], true);
         if (!empty($wxRes) && empty($userId)) {
             $userId = $wxRes->userId ?? 0;
@@ -50,7 +50,9 @@ class LlUserClass extends BaseClass
         if (!empty($userId)) {
             $user = self::getById($userId, true);
         } else {
-            $user = self::add($user, true);
+            $userInfo['firstDate'] = $thatDate;
+            $userInfo['lastDate'] = $thatDate;
+            $user = self::add($userInfo, true);
         }
 
         if (!empty($baseId)) {
@@ -68,12 +70,11 @@ class LlUserClass extends BaseClass
             if (!empty($no)) {
                 $base = LlBaseClass::getByCondition(['no' => $no], true);
                 if (empty($base)) {
-                    $baseData = ['no' => $no, 'name' => $name,];
+                    $baseData = ['no' => $no, 'name' => $name,'firstDate'=>$thatDate,'lastDate'=>$thatDate];
                     $base = LlBaseClass::add($baseData, true);
                 }
             }
         }
-
         $userId = $user->id ?? 0;
         $baseId = $base->id ?? 0;
         if (!empty($wx)) {