更新 app/api/lists/order/CartList.php

app/admin/logic/beforehand_order/BeforehandOrderLogic.php

@@ -968,14 +968,25 @@ class BeforehandOrderLogic extends BaseLogic
             $v['store_name'] = $find['store_name'];
             $v['mark'] = $find['after_sales'];
             if (isset($params['type']) && $params['type'] == 2) {
-                $v['price'] = $v['vip_price']; //出库单价
+                $price = $v['cost'];
-                $v['purchase'] = $v['cost']; //高级会员单，供货价=商户价
+                $v['pay_price'] = bcmul($price, $v['nums'], 2);
             } else {
-                $v['purchase'] = $v['vip_price'] > 0 ? $v['vip_price'] : $v['price']; //会员单，供货价=会员价
+                if ($v['vip_price'] > 0) {
+                    $v['pay_price'] = bcmul($v['vip_price'], $v['nums'], 2);
+                    $price = $v['vip_price'];
+                } else {
+                    $price = StoreProductGroupPrice::where('product_id', $v['product_id'])->where('group_id', $user_ship)->value('price');
+                    if ($price > 0) {
+                        $v['pay_price'] = bcmul($price, $v['nums'], 2);
+                    } else {
+                        $price = $find['cost'];
+                        $v['pay_price'] = bcmul($price, $v['nums'], 2);
+                    }
+                    WarehouseProduct::where('id', $v['id'])->update(['vip_price' => $price]);
+                }
             }
 
-            $v['total_price'] = bcmul($v['price'], $v['nums'], 2); //出库总价
+            $v['purchase'] = $price;
-            $v['pay_price'] = bcmul($v['purchase'], $v['nums'], 2); //供货总价
             $v['profit'] = bcsub($v['total_price'], $v['pay_price'], 2);
             $total_profit = bcadd($total_profit, $v['profit'], 2);
             $pay_price = bcadd($pay_price, $v['pay_price'], 2);

app/admin/logic/purchase_product_offer/PurchaseProductOfferLogic.php

@@ -217,7 +217,7 @@ class PurchaseProductOfferLogic extends BaseLogic
         $offer = PurchaseProductOffer::where(['id' => $params['id']])->find();
         $lastPrice = PurchaseProductOffer::where(['product_id' => $offer['product_id']])->where('status', 1)->order('id desc')->value('price');
         $currentPrice = bcdiv($params['total_price'], $params['buyer_nums'], 2);
-        if ($lastPrice > 0 && ($currentPrice > $lastPrice * 3 || $currentPrice < $lastPrice / 3)) {
+        if (!empty($lastPrice) && ($currentPrice > $lastPrice * 3 || $currentPrice < $lastPrice / 3)) {
             throw new BusinessException('价格异常，请重新输入');
         }
         // $uid=Admin::where('id',$params['admin_id'])->value('uid');

app/admin/logic/warehouse_order/WarehouseOrderLogic.php

@@ -123,11 +123,7 @@ class WarehouseOrderLogic extends BaseLogic
                     $data['purchase'] = $v['prices'];
                     $data['total_price'] = bcmul($v['prices'], $v['nums'], 2);
                 }
-                if ($data['financial_pm'] == 1) {
+                WarehouseProductLogic::add($data,1,$params['admin_id']);
-                    WarehouseProductLogic::add($data,1,$params['admin_id']);
-                } else {
-                    WarehouseProductLogic::setOutbound($data,1,$params['admin_id']);
-                }
             }
             $find = WarehouseProduct::where('oid', $params['id'])->field('sum(nums) as nums,sum(total_price) as total_price')->find();
             if ($find) {

app/api/lists/order/CartList.php

@@ -85,7 +85,7 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists
                 if ($off_activity == 0 && $user_ship == 5 && $product['top_cate_id'] == 15189) {
                     $product['price'] = $product['cost'];
                 }
-                if ($user_ship == 4) {
+                 if ($user_ship == 4 ) {
                     $product['price'] = $product['cost'];
                 }
                 $item['goods_total_price'] = bcmul($item['cart_num'], $product['price'], 2);