1

app/api/controller/order/StoreOrderController.php

@@ -139,10 +139,11 @@ class StoreOrderController
                 return app('json')->status('ORDER_EXIST', '订单生成失败，你已经参加该团了，请先支付订单', ['orderId' => StoreOrder::getStoreIdPink($pinkId, $request->uid())]);
         }
         $priceGroup = StoreOrder::cacheKeyCreateOrder($request->uid(), $key, $addressId, $payType, (int)$useIntegral, $couponId, $mark, $combinationId, $pinkId, $seckill_id, $bargainId, true, 0, $shipping_type);
-        if ($priceGroup['pay_postage']<0){
-            $priceGroup['pay_postage']=0;
-            $priceGroup['pay_type']=='到付';
-        }
+        var_dump($priceGroup);die();
+        //        if ($priceGroup['pay_postage']<0){
+//            $priceGroup['pay_postage']=0;
+//            $priceGroup['pay_type']=='到付';
+//        }
         if ($priceGroup)
             return app('json')->status('NONE', 'ok', $priceGroup);
         else

app/models/store/StoreOrder.php

@@ -151,10 +151,11 @@ class StoreOrder extends BaseModel
             }
             if ($storeFreePostage <= $totalPrice) $storePostage = 0;//如果总价大于等于满额包邮 邮费等于0
             if ($temp['collect_on_delivery']==1){
-                $storePostage = -1;
+                $storePostage = 0;
+                $storeType = '到付';
             }
         }
-        return compact('storePostage', 'storeFreePostage', 'totalPrice', 'costPrice', 'vipPrice', 'totalIntegral');
+        return compact('storePostage', 'storeFreePostage', 'totalPrice', 'costPrice', 'vipPrice', 'totalIntegral','storeType');
     }