hg

Author: yanglin

models/Shop.php

@@ -39,7 +39,7 @@ public static function tableName()
     public function rules()
     {
         return [
-            [['store_id', 'is_delete', 'addtime', 'score'], 'integer'],
+            [['hg_id','store_id', 'is_delete', 'addtime', 'score'], 'integer'],
             [['longitude', 'latitude', 'cover_url', 'pic_url', 'content'], 'string'],
             [['name', 'mobile', 'address', 'shop_time'], 'string', 'max' => 255],
         ];
@@ -61,6 +61,7 @@ public function attributeLabels()
             'longitude' => 'Longitude',
             'latitude' => 'Latitude',
             'score' => '评分 1~5',
+            'hg_id' => 'hg',
             'cover_url' => '门店大图',
             'pic_url' => '门店小图',
             'shop_time' => '营业时间',

modules/api/controllers/couponmall/IndexController.php

@@ -125,8 +125,14 @@ public function actionOpendoor()
             //如果柜子存在
             if(empty($shop['code']) && $shop['success']){
                 //如果货柜编号相等//调用补货接口开门
-                $hg_id=$hg_id;
-
+                if(!isset($shop['data']['shop']['hg_id']) || $hg_id != $shop['data']['shop']['hg_id']){
+                    return json_encode([
+                        'code'  => '1',
+                        'msg'   => '不是您的货柜',
+                        'success'   => false,
+                        'data'  => '不是您的货柜',
+                    ],JSON_UNESCAPED_UNICODE);
+                }
                 //开始调用货柜补货
                 unset($biz_content['unionid']);
                 //不用同步用户信息

modules/mch/models/ShopForm.php

@@ -35,13 +35,14 @@ class ShopForm extends Model
     public $content;
     public $shop_time;
     public $shop_pic;
+    public $hg_id;
 
     public function rules()
     {
         return [
             [['name', 'mobile', 'address','latitude','longitude'], 'required'],
             [['name', 'mobile', 'address','latitude','longitude','cover_url','pic_url','content','shop_time'], 'string'],
-            [['name', 'mobile', 'address','cover_url','pic_url','content','shop_time'], 'trim'],
+            [['hg_id','name', 'mobile', 'address','cover_url','pic_url','content','shop_time'], 'trim'],
             [['score'],'integer','min'=>1,'max'=>5],
             [['shop_pic'],'safe']
         ];
@@ -56,6 +57,7 @@ public function attributeLabels()
             'latitude'=>'经纬度',
             'longitude'=>'经纬度',
             'score'=>'评分',
+            'hg_id'=>'hg',
             'cover_url'=>'货柜大图',
             'pic_url'=>'门店小图',
             'content'=>'门店介绍',

modules/mch/views/store/shop-edit.php

@@ -159,6 +159,17 @@
                         <div class="text-danger">仅支持1~5的评分</div>
                     </div>
                 </div>
+
+                <div class="form-group row">
+                    <div class="col-3 text-right">
+                        <label class=" col-form-label">货柜设置实体货柜编号（关联）：</label>
+                    </div>
+                    <div class="col-9">
+                        <input class="form-control" type="number" name="hg_id" min="1" max="100000000"
+                               value="<?= $shop->hg_id ? $shop->hg_id : 0 ?>">
+                        <div class="text-danger">只设置数字，到微信小程序后台发布链接该二维码，并把二维码制作在实体货柜上</div>
+                    </div>
+                </div>
                 <div class="form-group row">
                     <div class="col-3 text-right">
                         <label class=" col-form-label">营业时间：</label>