Merge branch 'dev' of https://gitea.lihaink.cn/mkm/multi-store into dev

app/api/logic/order/OrderLogic.php

@@ -128,7 +128,11 @@ class OrderLogic extends BaseLogic
                 self::$store_price = bcadd(self::$store_price, $cart_select[$k]['store_price'], 2);//门店零售价格
                 // self::$profit = bcadd(self::$profit, $cart_select[$k]['profit'], 2);
             }
-            $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额
+            if ($user && $user['user_ship'] == 1) {
+                $pay_price = self::$pay_price;
+            }else{
+                $pay_price =bcsub(self::$pay_price, self::$activity_price, 2); //减去活动优惠金额
+            }
 
             $vipPrice = 0;
             //成本价  收益