...
|
...
|
@@ -330,7 +330,7 @@ class CartModel |
|
|
// cookie保存的数据
|
|
|
if (!empty($cookieData)) {
|
|
|
$orderInfo = json_decode($cookieData, true);
|
|
|
// $orderCompute = self::orderCompute($uid, $cartType, $orderInfo['deliveryId'], $orderInfo['paymentTypeId'], $orderInfo['couponCode'], $orderInfo['yohoCoin']);
|
|
|
$orderCompute = self::orderCompute($uid, $cartType, $orderInfo['deliveryId'], $orderInfo['paymentTypeId'], $orderInfo['couponCode'], $orderInfo['yohoCoin']);
|
|
|
}
|
|
|
|
|
|
// 根据地址id查询地址信息
|
...
|
...
|
@@ -449,18 +449,21 @@ class CartModel |
|
|
$one = array();
|
|
|
$one['id'] = $inv['invoices_type_id'];
|
|
|
$one['name'] = $inv['invoices_type_name'];
|
|
|
$one['id'] == $orderInfo['invoiceType'] && $one['isSelected'] = true;
|
|
|
isset($orderInfo['invoiceType']) && $one['id'] == $orderInfo['invoiceType'] && $one['isSelected'] = true;
|
|
|
|
|
|
$result['invoice'][] = $one;
|
|
|
}
|
|
|
|
|
|
// 发票信息需要记录
|
|
|
$result['needInvoice'] = $orderInfo['invoice'];
|
|
|
$result['invoiceText'] = $orderInfo['invoiceText'];
|
|
|
if (isset($orderInfo['invoice'])) {
|
|
|
$result['needInvoice'] = $orderInfo['invoice'];
|
|
|
$result['invoiceText'] = $orderInfo['invoiceText'];
|
|
|
}
|
|
|
|
|
|
}
|
|
|
|
|
|
// 留言
|
|
|
$result['msg'] = $orderInfo['msg'];
|
|
|
isset($orderInfo['msg']) && $result['msg'] = $orderInfo['msg'];
|
|
|
|
|
|
// 优惠券数据
|
|
|
$coupons = array();
|
...
|
...
|
@@ -572,7 +575,7 @@ class CartModel |
|
|
$result = array();
|
|
|
|
|
|
$orderSubRes = CartData::orderSub($uid, $addressId, $cartType, $deliveryTime, $deliveryWay, $invoiceTitle, $invoiceId, $paymentId, $paymentType, $remark, $yohoCoin);
|
|
|
if ($orderSubRes && isset($orderSubRes['code']) && $orderSubRes['code'] === 200) {
|
|
|
if ($orderSubRes && isset($orderSubRes['code'])) {
|
|
|
$result = $orderSubRes;
|
|
|
}
|
|
|
|
...
|
...
|
|