商户修改选品价格

app/common/repositories/store/product/ProductRepository.php

@@ -1944,16 +1944,18 @@ class ProductRepository extends BaseRepository
                 ->where('product_id', $product_id)
                 ->select()->toArray();
             $attrInfo = array_column($attrInfo, null, 'gong_sku_id');
-            $updateData = [];
+            $updateData = [];   
             // 组装数据
             foreach ($skuArr as $key => $value) {
                 if (isset($attrInfo[$value['sku_id']])) {
+
                     if ($value['edit_price'] > $attrInfo[$value['sku_id']]['gong_market_price']) {
                         // 上调价格计算创客利润
                         $diff = bcsub($value['edit_price'], $attrInfo[$value['sku_id']]['gong_market_price'], 2);
-                        $diff_profit = bcmul($diff, 0.7, 2);
+                        // $diff_profit = bcmul($diff, 0.7, 2);
+                        $diff_profit = $diff;
                         $plate_mer_profit = bcadd($attrInfo[$value['sku_id']]['gong_mer_profit'], $diff_profit, 2);
-                    } else {
+                    } else {    
                         // 下调价格计算创客利润
                         $diff = bcsub($attrInfo[$value['sku_id']]['gong_market_price'], $value['edit_price'], 2);
                         $plate_mer_profit = bcsub($attrInfo[$value['sku_id']]['gong_mer_profit'], $diff, 2);

app/controller/merchant/gong/Goods.php

@@ -320,10 +320,10 @@ class Goods extends BaseController
                     'cost_price'=>$v['cost_price'],
                     'extension_one'=>5,
                     'gong_sku_id'=>$v['sku_id'],
-                    'gong_mer_profit' => $v['profit'],
+                    'gong_mer_profit' => $v['mer_profit'],
                     'gong_pension' => $v['yanglaojin'],
                     'gong_market_price' => $v['market_price'],
-                    'plate_mer_profit' => $v['profit']
+                    'plate_mer_profit' => $v['mer_profit']
                 ]);
                 $key='';
                 $num++;
@@ -357,10 +357,10 @@ class Goods extends BaseController
                     'cost_price'=>$v['cost_price'],
                     'extension_one'=>5,
                     'gong_sku_id'=>$v['sku_id'],
-                    'gong_mer_profit' => $v['profit'],
+                    'gong_mer_profit' => $v['mer_profit'],
                     'gong_pension' => $v['yanglaojin'],
                     'gong_market_price' => $v['market_price'],
-                    'plate_mer_profit' => $v['profit']
+                    'plate_mer_profit' => $v['mer_profit']
                 ]);
                 $key='';
                 $num++;