Merge branch 'master' into dev

app-ghs/controllers/OrderController.php

@@ -1285,7 +1285,8 @@ class OrderController extends BaseController
                 if (empty($zjGatheringItemInfo)) {
                     util::fail('请设置收款的商品呢');
                 }
-                $productList = [['productId' => $zjGatheringItem, 'bigNum' => 1, 'smallNum' => 0, 'classId' => 0, 'price' => $gatheringPrice]];
+                $zjPtItemId = $zjGatheringItemInfo->itemId ?? 0;
+                $productList = [['productId' => $zjGatheringItem, 'itemId' => $zjPtItemId, 'bigNum' => 1, 'smallNum' => 0, 'classId' => 0, 'price' => $gatheringPrice]];
             }
         } else {
             $productList = json_decode($productJson, true);