门店保存图片

app-ghs/controllers/BaseController.php

@@ -60,7 +60,7 @@ class BaseController extends PublicController
                 util::fail('您还不是员工哦');
             }
             if (isset($shopAdmin['status']) && $shopAdmin['status'] == 0) {
-                util::fail('您的帐号已经禁用');
+                util::fail('您的帐号已被禁用');
             }
             $this->shopAdmin = $shopAdmin;
             $this->shopAdminId = $shopAdmin['id'] ?? 0;

app-hd/controllers/BaseController.php

@@ -62,7 +62,7 @@ class BaseController extends PublicController
                 util::fail('您还不是员工哦');
             }
             if (isset($shopAdmin['status']) && $shopAdmin['status'] == 0) {
-                util::fail('您的帐号已经禁用');
+                util::fail('您的帐号已被禁用');
             }
             $this->shopAdmin = $shopAdmin;
             $this->shopAdminId = $shopAdmin['id'] ?? 0;

app-pt/controllers/ShopAdminController.php

@@ -30,6 +30,11 @@ class ShopAdminController extends BaseController
         if (empty($shopAdmin)) {
             util::fail('没有找到员工');
         }
+
+        if (getenv('YII_DEBUG') != 'local' || getenv('YII_DEBUG') != 'dev') {
+            util::fail('生产环境不能执行删除操作');
+        }
+
         $adminId = $shopAdmin['adminId'] ?? 0;
         $sjId = $shopAdmin['merchantId'] ?? 0;
         SjClass::deleteById($sjId);

biz-hd/merchant/classes/ShopClass.php

@@ -40,8 +40,8 @@ class ShopClass extends BaseClass
         if (!empty($exists)) {
             util::fail('门店名称已经存在');
         }
+        $data['img'] = json_encode($data['img']);
         $shop = self::add($data);
-
         return $shop;
     }
 

common/components/dict.php

@@ -10,7 +10,7 @@ class dict
     public static $data = [
 
         //需要显示国兰的信息 0不需要 1需要（要审核小程序请显示国兰信息）
-        'showGlInfo' => 1,
+        'showGlInfo' => 0,
         //显示零售和供货商的演示入口
         'showDemo' => 1,
         //零售演示的管理员id

sql.sql

@@ -2349,6 +2349,7 @@ ALTER TABLE xhPurchaseClear ADD `status` TINYINT NOT NULL DEFAULT 1 COMMENT '状
 ALTER TABLE xhPurchaseClear ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER `merchantId`;
 ALTER TABLE xhPurchaseClear CHANGE `merchantId` `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家id';
 ALTER TABLE xhPurchaseClear ADD ghsId INT NOT NULL DEFAULT 0 COMMENT '供货商id' AFTER `orderSn`;
+ALTER TABLE xhGhsCustom ADD debtNum INT NOT NULL DEFAULT 0 COMMENT '欠款笔数' AFTER `debtAmount`;
 
 -------- ruidian 20210505
 ALTER TABLE `xhGoods`