update:set

application/services/marketing/MarketingGoodsService.php

@@ -51,6 +51,9 @@ class MarketingGoodsService
     public static function marketingGoodsList($params)
     {   
         $limit = !empty($params['num']) ? $params['num'] : 20;
+
+        $userId = !empty($params['user_id']) ? $params['user_id'] : '';
+
         
         if (!empty($params['last_id'])) {
             $where['id[<]'] = $params['last_id'];
@@ -93,6 +96,14 @@ class MarketingGoodsService
             $list[$i] = $value;
             $list[$i]['life_account_id'] = !empty($goodsSkuList[$value['goods_sku_id']]['life_account_id']) ? $goodsSkuList[$value['goods_sku_id']]['life_account_id'] : '';
             
+            $publishUserId = !empty($goodsSkuList[$value['goods_sku_id']]['publish_user_id']) ? $goodsSkuList[$value['goods_sku_id']]['publish_user_id'] : '';
+
+            if (!empty($userId) && $userId == $publishUserId) {
+                $list[$i]['is_self_publish'] = 1;
+            }else{
+                $list[$i]['is_self_publish'] = 1;
+            }
+            
             $life_account_id = !empty($list[$i]['life_account_id']) ? $list[$i]['life_account_id'] : '';
 
             $list[$i]['life_account_name'] = !empty($lifeAccountList[$life_account_id]['life_account_name']) ? $lifeAccountList[$life_account_id]['life_account_name'] : '';

application/services/marketing/MarketingService.php

@@ -65,6 +65,9 @@ class MarketingService
         }
         
         $goodsSkuList = GoodsSku::select('*', $where);
+
+        print_r(GoodsSku::log());
+        
         $lifeAccountIds = [];
         if (!empty($goodsSkuList)) {
             $lifeAccountIds = array_column($goodsSkuList, 'life_account_id');
@@ -128,6 +131,12 @@ class MarketingService
         $where['ORDER'] = ["create_time" => "DESC"];
         $where['LIMIT'] = [$page, $limit];
         $list = Marketing::getRecords($where);
+        $lists = [];
+        foreach ($list as $key => $value) {
+           $lists[$key] = $value;
+           $lists[$key]['first_commission_value'] = !empty($value['first_commission_value']) ? $value['first_commission_value']/100 : 0;
+           $lists[$key]['second_commission_value'] = !empty($value['second_commission_value']) ? $value['second_commission_value']/100 : 0;
+        }
         unset($where['LIMIT']);
         unset($where['ORDER']);
         $count = Marketing::getCount($where);
@@ -144,8 +153,8 @@ class MarketingService
     public static function addMarketing($params){
 
         $marketingName = !empty($params['marketing_name']) ? $params['marketing_name'] : '';
-        $firstCommissionRate = !empty($params['first_commission_value']) ? $params['first_commission_value'] : '';
-        $secondCommissionRate = !empty($params['second_commission_value']) ? $params['second_commission_value'] : '';
+        $firstCommissionRate = !empty($params['first_commission_value']) ? $params['first_commission_value']*100 : '';
+        $secondCommissionRate = !empty($params['second_commission_value']) ? $params['second_commission_value']*100 : '';
         $createUserEmail = !empty($params['op_cur_user']) ? $params['op_cur_user'] : '';
         $startTime = !empty($params['start_time']) ? $params['start_time'] : '';
         $endTime = !empty($params['end_time']) ? $params['end_time'] : '';