|
|
@@ -83,6 +83,7 @@ class StoreOrder extends BaseModel
|
|
|
$costPrice = self::getOrderSumPrice($cartInfo, 'costPrice');//获取订单成本价
|
|
|
$vipPrice = self::getOrderSumPrice($cartInfo, 'vip_truePrice');//获取订单会员优惠金额
|
|
|
//如果满额包邮等于0
|
|
|
+ $storeType = '无';
|
|
|
if (!$storeFreePostage) {
|
|
|
$storePostage = 0;
|
|
|
} else {
|
|
|
@@ -150,6 +151,7 @@ class StoreOrder extends BaseModel
|
|
|
$storePostage = 0;
|
|
|
}
|
|
|
if ($storeFreePostage <= $totalPrice) $storePostage = 0;//如果总价大于等于满额包邮 邮费等于0
|
|
|
+
|
|
|
if ($temp['collect_on_delivery']==1){
|
|
|
$storePostage = 0;
|
|
|
$storeType = '到付';
|
|
|
@@ -304,6 +306,8 @@ class StoreOrder extends BaseModel
|
|
|
$payPostage = 0;
|
|
|
} else {
|
|
|
$payPostage = self::getOrderPriceGroup($cartInfo, $addr)['storePostage'];
|
|
|
+ $payType = self::getOrderPriceGroup($cartInfo, $addr)['payType'];
|
|
|
+
|
|
|
}
|
|
|
if ($shipping_type === 1) {
|
|
|
if (!$test && !$addressId) return self::setErrorInfo('请选择收货地址!', true);
|
|
|
@@ -435,6 +439,7 @@ class StoreOrder extends BaseModel
|
|
|
'deduction_price' => $deductionPrice,
|
|
|
'totalIntegral' => $payIntegral,
|
|
|
'SurplusIntegral' => $SurplusIntegral,
|
|
|
+ 'payType' => $payType,
|
|
|
];
|
|
|
}
|
|
|
$mer_id = array_unique($mer_id);
|