Merge remote-tracking branch 'origin/redesign‌-260706' into redesign‌-260706

app-mall/controllers/GroupBuyController.php

@@ -2,12 +2,14 @@
 
 namespace mall\controllers;
 
+use bizHd\custom\classes\CustomClass;
 use bizHd\goods\classes\GoodsClass;
 use bizHd\groupBuy\classes\GroupBuyActivityClass;
 use bizHd\groupBuy\classes\GroupBuyClass;
 use bizHd\groupBuy\classes\GroupBuyMemberClass;
 use bizHd\order\services\OrderService;
 use bizHd\shop\classes\ShopClass;
+use bizMall\hd\classes\HdClass;
 use common\components\business;
 use common\components\dict;
 use common\components\orderSn;
@@ -192,8 +194,16 @@ class GroupBuyController extends BaseController
         $form->loadAndValidate();
         $mainId = intval($this->mainId);
         $custom = $this->custom;
+        $currentShopId = Yii::$app->request->get('account', 0);
         if (empty($custom)) {
-            util::fail('请先登录');
+            //util::fail('请先登录');
+            $hd = HdClass::getByCondition(['shopId'=>$currentShopId, 'userId'=>$this->userId], false, null, 'id, customId');
+            if (empty($hd)) {
+                // 创建关系？？？
+                util::fail('客户暂无关联此店');
+            }
+            $customId = $hd['customId'];
+            $custom = CustomClass::getById($customId, true);
         }
         $customId = intval($custom->id);
         $groupBuyId = intval($form->groupBuyId);

app-mall/models/groupBuy/JoinGroupBuyForm.php

@@ -12,18 +12,13 @@ class JoinGroupBuyForm extends BaseForm
     public $groupBuyId;
     public $goodsNum;
     public $sendType;
-    public $receiveUserName;
+    public $account;
     public $receiveMobile;
     public $address;
     public $floor;
     public $city;
     public $long;
     public $lat;
-    public $showAddress;
-    public $remark;
-    public $reachDate;
-    public $reachPeriod;
-    public $bookMobile;
 
     public function rules()
     {
@@ -34,7 +29,7 @@ class JoinGroupBuyForm extends BaseForm
             ['goodsNum', 'integer', 'min' => 1, 'max' => 99, 'message' => '购买数量无效'],
             ['sendType', 'default', 'value' => 1],
             ['sendType', 'integer'],
-            [['receiveUserName', 'receiveMobile', 'address', 'floor', 'city', 'long', 'lat', 'showAddress', 'remark', 'reachDate', 'reachPeriod', 'bookMobile'], 'safe'],
+            [['receiveMobile', 'address', 'floor', 'city', 'long', 'lat', ], 'safe'],
         ];
     }
 

biz-hd/groupBuy/classes/GroupBuyActivityClass.php

@@ -86,10 +86,12 @@ class GroupBuyActivityClass extends BaseClass
 
         // 更新活动基础信息（同一批次内修改标题/说明等）
         self::updateById($activityId, [
-            'title' => strval($base['title'] ?? ''),
-            'subtitle' => strval($base['subtitle'] ?? ''),
+            'title' => $base['title'],
+            'subtitle' => $base['subtitle'],
             'showCountdown' => !empty($base['showCountdown']) ? 1 : 0,
             'expand' => !empty($base['expand']) ? 1 : 0,
+            'startTime' => $base['startTime'],
+            'endTime' => $base['endTime'],
             'desc' => strval($base['desc'] ?? ''),
             'status' => 1,
             'delStatus' => 0,