fix 修改积分逻辑

crmeb/app/adminapi/controller/v1/marketing/integral/StoreIntegral.php

@@ -68,7 +68,8 @@ class StoreIntegral extends AuthController
             [['description', 's'], ''],
             ['attrs', []],
             ['items', []],
-            ['copy', 0]
+            ['copy', 0],
+            ['goods_user_type', 0],
         ]);
         $this->validate($data, \app\adminapi\validate\marketing\StoreIntegralValidate::class, 'save');
         if ($id) {

crmeb/app/api/controller/v1/activity/StoreIntegralController.php

@@ -4,7 +4,7 @@ namespace app\api\controller\v1\activity;
 
 use app\Request;
 use app\services\activity\integral\StoreIntegralServices;
-
+use app\services\user\UserWechatuserServices;
 class StoreIntegralController
 {
     protected $services;
@@ -21,11 +21,15 @@ class StoreIntegralController
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function index()
+    public function index(Request $request)
     {
         $data['banner'] = sys_data('integral_shop_banner') ?? [];//TODO 积分商城banner
         $where = ['is_show' => 1];
         $where['is_host'] = 1;
+        $uid = (int)$request->uid();
+        $userInfo = app()->make(UserWechatuserServices::class)->getUserByUid($uid);
+        $goods_user_type = $userInfo['goods_user_type'];
+        $where['goods_user_type'] = $goods_user_type;
         $data['list'] = $this->services->getIntegralList($where);
         return app('json')->success(get_thumb_water($data, 'big'));
     }
@@ -43,6 +47,10 @@ class StoreIntegralController
             ['salesOrder', ''],
         ]);
         $where['is_show'] = 1;
+        $uid = (int)$request->uid();
+        $userInfo = app()->make(UserWechatuserServices::class)->getUserByUid($uid);
+        $goods_user_type = $userInfo['goods_user_type'];
+        $where['goods_user_type'] = $goods_user_type;
         $list = $this->services->getIntegralList($where);
         return app('json')->success(get_thumb_water($list, 'mid'));
     }

crmeb/app/dao/activity/integral/StoreIntegralDao.php

@@ -61,6 +61,8 @@ class StoreIntegralDao extends BaseDao
                 list($startTime, $endTime) = explode('-', $where['integral_time']);
                 $query->where('add_time', '>', strtotime($startTime))
                     ->where('add_time', '<', strtotime($endTime) + 24 * 3600);
+            })->when(isset($where['goods_user_type']), function($query) use ($where) {
+                $query->where('goods_user_type', $where['goods_user_type']);
             })->when(isset($where['priceOrder']) && $where['priceOrder'] != '', function ($query) use ($where) {
                 if ($where['priceOrder'] === 'desc') {
                     $query->order("price desc");