Merge branch 'master' of https://git.bjtdba.com/shop/php

app/common/repositories/user/UserRepository.php

@@ -3244,6 +3244,10 @@ class UserRepository extends BaseRepository
         }
 
         $userData = $this->dao->get($uid)->toArray();
+        // 只升级 不降级
+        if ($identityId < $userData['user_group']) {
+            $identityId = $userData['user_group'];
+        }
         $data = ['user_group' => $identityId];
         if (empty($userData['identity_up_time'] ?? null) && $userData['user_group'] == 1 && $identityId > 1) {
             $data['identity_up_time'] = date('Y-m-d H:i:s');
@@ -3339,7 +3343,6 @@ class UserRepository extends BaseRepository
             // 从小向大循环，满足则去 下一等级继续验证，不满足 则 返回上次循环记录的值，并结束循环
             if ($item['arrive_num_own'] <= $arriveNumOwn && $item['arrive_num_team'] <= $arriveNumTeam) {
                 $identityId = $item['user_group_id'];
-
                 // 用户等级限制，本次获取身份 最大可获取什么身份，比如 用户没有 团队贡献值，他最高只能升到 2 级 即业务员
                 if ($identityId == $maxLvRestrict) {
                     break;
@@ -3348,6 +3351,9 @@ class UserRepository extends BaseRepository
                 break;
             }
         }
+        if ($identityId < $userData['user_group']) {
+            $identityId = $userData['user_group'];
+        }
         return $identityId;
     }
 
@@ -3638,13 +3644,13 @@ class UserRepository extends BaseRepository
                         break;
                     }
                 }
-                if (!empty($myIdentityUpTime) && !empty($yeWuYuanId)) {
-                    $userData['identity_up_time'] = $myIdentityUpTime;
-                    $userData['user_group'] = $yeWuYuanId;
-                    $this->dao->update($uid, [
-                        'identity_up_time' => $userData['identity_up_time'],
-                        'user_group' => $yeWuYuanId
-                    ]);
+                if (!empty($myIdentityUpTime)) {
+                    $data['identity_up_time'] = $userData['identity_up_time'] = $myIdentityUpTime;
+                    // 只升级 不降级
+                    if ($userData['user_group'] == 1) {
+                        $userData['user_group'] = $yeWuYuanId;
+                    }
+                    $this->dao->update($uid, $data);
                 }
             }
         }

app/controller/api/store/merchant/Taskorderguquan.php

@@ -12,6 +12,78 @@ use think\facade\Db;
 class Taskorderguquan
 {
 
+    public function assignment()
+    {
+        /**
+         * 周金花200(13959100621)
+         * 黄金花200(18603401312)
+         * 徐立苹100(13521438652)
+         * 李素红200(13701061395)
+         * 周行体200(13231658486)
+         * 刘银霞100(13161909228)
+         * 李卫东100(13911601230)
+         * 金    波100(13801358713)
+         * 王   玲 150(15810064711)
+         * 侯玉兰150(15232797965)
+         * 吕丽娣100(15960349667)
+         * 张传莲100(15332507711)
+         * 刘春梅100(18760167163)
+         * 付天如100(18863873000)
+         * 付绍先100(15324059286)
+         * 黄桂林100(15960196876)
+         * 温  煌100(18350134089)
+         * 谭英先100(13978627072)
+         * 陈玉珍100(19858353660)
+         * 黄雪云100(18650055445)
+         * 黄  玲100(13877193411)
+         * 邱佳珍100(13960379098)
+         * 隋彩云100（13601071082）
+         */
+        $data = [
+            '13959100621' => 200,
+            '18603401312' => 200,
+            '13521438652' => 100,
+            '13701061395' => 200,
+            '13231658486' => 200,
+            '13161909228' => 100,
+            '13911601230' => 100,
+            '13801358713' => 100,
+            '15810064711' => 150,
+            '15232797965' => 150,
+            '15960349667' => 100,
+            '15332507711' => 100,
+            '18760167163' => 100,
+            '18863873000' => 100,
+            '15324059286' => 100,
+            '15960196876' => 100,
+            '18350134089' => 100,
+            '13978627072' => 100,
+            '19858353660' => 100,
+            '18650055445' => 100,
+            '13877193411' => 100,
+            '13960379098' => 100,
+            '13601071082' => 100,
+        ];
+        $result = Db::name("user")
+            ->whereIn("account", array_keys($data))
+            ->where('is_del', 0)
+            ->field('uid, brokerage_price, account, nickname')
+            ->select();
+        $res = [];
+        foreach ($result as $v) {
+            Db::name("user")->where("uid", $v['uid'])->inc("brokerage_price", $data[$v['account']])->save();
+            $this->bill_user_log111111($v['uid'], "佣金补贴", $data[$v['account']], "佣金补贴", 8);//股权分佣明细2.0系统
+            $res[] = [
+                'uid' => $v['uid'],
+                'account' => $v['account'],
+                'brokerage_price_pre' => $v['brokerage_price'],
+                'brokerage_price' => $data[$v['account']],
+                'nickname' => $v['nickname']
+            ];
+        }
+        return json($res);
+
+    }
 
     public function lst6()
     {

route/api.php

@@ -1294,10 +1294,10 @@ Route::group('api/', function () {
     ->middleware(\app\common\middleware\AllowOriginMiddleware::class)
     ->middleware(\app\common\middleware\InstallMiddleware::class)
     ->middleware(\app\common\middleware\CheckSiteOpenMiddleware::class);
-//Route::get('/sxb_test', 'api.store.merchant.TaskPartnerProfits/partnerProfits');
-Route::get('test_hehuoren', 'api.store.merchant.TaskPartnerProfits/partnerProfits');
-Route::get('test_guquan', 'api.store.merchant.Taskorderguquan/lst6');
-Route::get('test_lianchuang', 'api.store.merchant.Taskorderlianc/lst2');
+Route::get('/test/assignment', 'api.store.merchant.Taskorderguquan/assignment');
+//Route::get('test_hehuoren', 'api.store.merchant.TaskPartnerProfits/partnerProfits');
+//Route::get('test_guquan', 'api.store.merchant.Taskorderguquan/lst6');
+//Route::get('test_lianchuang', 'api.store.merchant.Taskorderlianc/lst2');
 Route::any('/share', function () {
     return view(app()->getRootPath() . 'public/share/register.html');
 });