客户信息

app-mall/controllers/OrderController.php

@@ -498,7 +498,7 @@ class OrderController extends BaseController
     //订单列表 ssh 2019.12.12
     public function actionList()
     {
-        $where = ['customId' => $this->customId];
+        $where = ['userId' => $this->userId];
         $list = OrderService::getOrderList($where);
         util::success($list);
     }

biz-mall/order/services/OrderService.php

@@ -12,6 +12,7 @@ use bizMall\order\classes\OrderClass;
 use bizMall\order\classes\OrderGoodsClass;
 use bizMall\order\classes\OrderItemClass;
 use bizMall\promote\services\CouponService;
+use bizMall\shop\classes\ShopClass;
 use bizMall\user\classes\UserAssetClass;
 use common\components\dict;
 use common\components\orderSn;
@@ -31,12 +32,27 @@ class OrderService extends BaseService
         $shopId = $data['shopId'] ?? 0;
         $userId = $data['userId'] ?? 0;
         $mainId = $data['mainId'] ?? 0;
+
+        $shop = ShopClass::getById($shopId, true);
+        if (empty($shop)) {
+            util::fail('没有找到门店');
+        }
         $custom = [];
         $customId = 0;
         $hdId = 0;
-        if (!empty($userId) && !empty($shopId)) {
+        if (!empty($userId)) {
             $custom = CustomClass::getByCondition(['shopId' => $shopId, 'userId' => $userId], true);
             $customId = $custom->id ?? 0;
+        } else {
+            $defaultCustomId = $shop->defaultCustomId ?? 0;
+            if (empty($defaultCustomId)) {
+                util::fail('没有找到默认客户');
+            }
+            $custom = CustomClass::getById($defaultCustomId, true);
+            if (empty($custom)) {
+                util::fail('没有默认客户');
+            }
+            $data['userId'] = $custom->userId ?? 0;
         }
         $product = $data['product'] ?? [];
         if (empty($product)) {

sql.sql

@@ -1026,4 +1026,5 @@ ALTER TABLE xhGhsStockOutOrderItem ADD mainId INT NOT NULL DEFAULT 0 COMMENT '
 ALTER TABLE xhGhsStockInOrder ADD outMainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `outShopId`;
 ALTER TABLE xhGhsStockInOrder ADD inMainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `inShopId`;
 ALTER TABLE xhGhsStockInOrderItem ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER `productId`;
-ALTER TABLE xhGhsStockInOrderItem ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `shopId`;
+ALTER TABLE xhGhsStockInOrderItem ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `shopId`;
+ALTER TABLE xhOrder ADD `userId` INT NOT NULL DEFAULT 0 COMMENT '用户id' AFTER `customId`;