|
|
@@ -252,7 +252,7 @@ class Checkout extends BaseService
|
|
|
// 积分抵扣总数量
|
|
|
$this->orderData['pointsNum'] = $actualPointsNum;
|
|
|
// 允许积分抵扣
|
|
|
- $this->orderData['is_allow_points'] = true;
|
|
|
+ $this->orderData['isAllowPoints'] = true;
|
|
|
return true;
|
|
|
}
|
|
|
|
|
|
@@ -603,7 +603,7 @@ class Checkout extends BaseService
|
|
|
* 订单配送-快递配送
|
|
|
* @return bool
|
|
|
* @throws \think\db\exception\DataNotFoundException
|
|
|
- * @throws \think\db\exception\DbException
|
|
|
+ * @throws \think\db\exception\DbException
|
|
|
* @throws \think\db\exception\ModelNotFoundException
|
|
|
*/
|
|
|
private function setOrderExpress()
|
|
|
@@ -613,9 +613,9 @@ class Checkout extends BaseService
|
|
|
'expressPrice' => 0,
|
|
|
], true);
|
|
|
// 当前用户收货城市id
|
|
|
- $cityId = $this->user['address_default'] ? (int)$this->user['address_default']['city_id'] : 0;
|
|
|
+ $cityId = $this->user['address_default'] ? (int)$this->user['address_default']['city_id'] : 0;
|
|
|
// 初始化配送服务类
|
|
|
- $ExpressService = new ExpressService($cityId, $this->goodsList);
|
|
|
+ $ExpressService = new ExpressService($cityId, $this->goodsList);
|
|
|
// 验证商品是否在配送范围
|
|
|
$isIntraRegion = $ExpressService->isIntraRegion();
|
|
|
if ($cityId > 0 && $isIntraRegion == false) {
|