|
|
@@ -639,15 +639,15 @@ class OrderController extends BaseController
|
|
|
$post['needPrint'] = dict::getDict('needPrint', 'noNeed');
|
|
|
$shopId = $this->shopId;
|
|
|
$ext = ShopExtClass::getByCondition(['shopId' => $shopId], true);
|
|
|
- $gatheringItem = !empty($ext) ? $ext->gatheringItem : 0;
|
|
|
- if (empty($gatheringItem)) {
|
|
|
+ $zjGatheringItem = !empty($ext) ? $ext->zjGatheringItem : 0;
|
|
|
+ if (empty($zjGatheringItem)) {
|
|
|
util::fail('请设置付款用的商品');
|
|
|
}
|
|
|
- $gatheringItemInfo = ProductClass::getById($gatheringItem, true);
|
|
|
- if (empty($gatheringItemInfo)) {
|
|
|
+ $zjGatheringItemInfo = ProductClass::getById($zjGatheringItem, true);
|
|
|
+ if (empty($zjGatheringItemInfo)) {
|
|
|
util::fail('付款用的商品没有设置');
|
|
|
}
|
|
|
- $productList = [['productId' => $gatheringItem, 'unitType' => 0, 'num' => 1, 'property' => '1', 'unitPrice' => $lsGoodsPrice]];
|
|
|
+ $productList = [['productId' => $zjGatheringItem, 'unitType' => 0, 'num' => 1, 'property' => '1', 'unitPrice' => $lsGoodsPrice]];
|
|
|
}
|
|
|
|
|
|
$connection = Yii::$app->db;
|