shish před 4 roky
rodič
revize
b9a9e99dab

+ 1 - 1
app-ghs/controllers/ChatController.php

@@ -108,7 +108,7 @@ class ChatController extends BaseController
 				$id = $post['goodsId'];
 				$info = GoodsService::getGoodsInfo($id);
 				GoodsService::valid($info, $this->sjId);
-				$arr['goodsName'] = $info['goodsName'];
+				$arr['name'] = $info['name'];
 				$arr['img'] = isset($info['smallImgList'][0]) ? $info['smallImgList'][0] : '';
 				$arr['price'] = isset($info['price']) ? $info['price'] : 300;
 				break;

+ 3 - 3
app-ghs/controllers/GoodsController.php

@@ -25,13 +25,13 @@ class GoodsController extends BaseController
     {
         $get = Yii::$app->request->get();
         $status = isset($get['status']) ? $get['status'] : -1;
-        $goodsName = isset($get['goodsName']) && !empty($get['goodsName']) ? $get['goodsName'] : '';
+        $name = isset($get['name']) && !empty($get['name']) ? $get['name'] : '';
         $where = [];
         if ($status != -1) {
             $where['status'] = $status;
         }
-        if (!empty($goodsName)) {
-            $where['goodsName'] = ['like', $goodsName];
+        if (!empty($name)) {
+            $where['name'] = ['like', $name];
         }
         if (isset($get['cId']) && $get['cId'] != -1) {
             $where['cId'] = $get['cId'];

+ 0 - 10
app-ghs/controllers/OrderController.php

@@ -575,11 +575,6 @@ class OrderController extends BaseController
     public function actionCreateOrder()
     {
         $post = Yii::$app->request->post();
-        if (isset($post['newVersion']) == false) {
-            util::fail('请升级小程序');
-        }
-        unset($post['newVersion']);
-
         $shopId = $this->shopId;
         $customId = $post['customId'] ?? 0;
         $post['customId'] = $customId;
@@ -660,11 +655,6 @@ class OrderController extends BaseController
     {
         $post = Yii::$app->request->post();
 
-        if (isset($post['newVersion']) == false) {
-            util::fail('请升级小程序');
-        }
-        unset($post['newVersion']);
-
         //PC端开单
         if (isset($post['clearType'])) {
             $clearType = $post['clearType'];

+ 1 - 1
app-hd/controllers/ChatController.php

@@ -108,7 +108,7 @@ class ChatController extends BaseController
 				$id = $post['goodsId'];
 				$info = GoodsService::getGoodsInfo($id);
 				GoodsService::valid($info, $this->sjId);
-				$arr['goodsName'] = $info['goodsName'];
+				$arr['name'] = $info['name'];
 				$arr['img'] = isset($info['smallImgList'][0]) ? $info['smallImgList'][0] : '';
 				$arr['price'] = isset($info['price']) ? $info['price'] : 300;
 				break;

+ 6 - 6
app-hd/controllers/GoodsController.php

@@ -27,13 +27,13 @@ class GoodsController extends BaseController
         $get = Yii::$app->request->get();
         $status = isset($get['status']) && is_numeric($get['status']) ? $get['status'] : -1;
         $cId = isset($get['cId']) && !empty($get['cId']) ? $get['cId'] : 0;
-        $goodsName = isset($get['goodsName']) && !empty($get['goodsName']) ? $get['goodsName'] : '';
+        $name = isset($get['name']) && !empty($get['name']) ? $get['name'] : '';
         $where = [];
         if ($status != -1) {
             $where['status'] = $status;
         }
-        if (!empty($goodsName)) {
-            $where['goodsName'] = ['like', $goodsName];
+        if (!empty($name)) {
+            $where['name'] = ['like', $name];
         }
         if (!empty($cId)) {
             $where['cId'] = $cId;
@@ -198,9 +198,9 @@ class GoodsController extends BaseController
     public function actionSaveItemGroup()
     {
         $orderSn = Yii::$app->request->post('orderSn', '');
-        $goodsName = Yii::$app->request->post('name', '');
+        $name = Yii::$app->request->post('name', '');
         $classId = Yii::$app->request->post('categoryId', 0);
-        if (empty($goodsName)) {
+        if (empty($name)) {
             util::fail("名称不能为空");
         }
         $cateExists = CategoryService::exists(['id' => $classId, 'sjId' => $this->sjId]);
@@ -213,7 +213,7 @@ class GoodsController extends BaseController
         }
         $order = OrderService::getOrderBySn($orderSn);
         OrderService::valid($order, $this->shopId);
-        $save = GoodsService::saveItemGroup($order, $itemInfo, $classId, $goodsName, $this->adminId);
+        $save = GoodsService::saveItemGroup($order, $itemInfo, $classId, $name, $this->adminId);
         if ($save) {
             util::complete();
         }

+ 1 - 1
app-mall/controllers/ChatController.php

@@ -71,7 +71,7 @@ class ChatController extends BaseController
 				$id = $post['goodsId'];
 				$info = GoodsService::getGoodsInfo($id);
 				GoodsService::valid($info, $this->sjId);
-				$arr['goodsName'] = $info['goodsName'];
+				$arr['name'] = $info['name'];
 				$arr['img'] = isset($info['smallImgList'][0]) ? $info['smallImgList'][0] : '';
 				$arr['price'] = isset($info['price']) ? $info['price'] : 300;
 				break;

+ 1 - 1
app-mall/controllers/OrderController.php

@@ -116,7 +116,7 @@ class OrderController extends BaseController
                 'goodsId' => $goodsId,
                 'userId' => $this->userId,
                 'sjId' => $this->sjId,
-                'title' => $goodsInfo['goodsName'],
+                'title' => $goodsInfo['name'],
                 'cover' => $currentCover,
                 'unitPrice' => $unitPrice,
                 'num' => $goodsNum,

+ 3 - 3
app-mall/controllers/PayController.php

@@ -89,7 +89,7 @@ class PayController extends BaseController
             $goodsNum += $num;
             $goods = xhGoodsService::getById($goodsId);
             if (empty($orderName)) {
-                $orderName = $goods['goodsName'];
+                $orderName = $goods['name'];
             }
             $price = $goods['price'];
             if ($val['multiPriceId'] != 0 && $goods['multiPrice'] != '') {
@@ -102,7 +102,7 @@ class PayController extends BaseController
                 //$price = $goodPrice['price'];
                 $price = xhGoodsSettingService::changePrice($goods, $goodPrice['price']);//统一对商品进行价格等方面设置
                 //多种价格规格 替换 默认(单价格)
-                $goods['goodsName'] = $goodPrice['title'];
+                $goods['name'] = $goodPrice['title'];
                 //$goods['cover'] = $goodPrice['picture'];//后台图片上传功能未开发,暂时使用默认商品图片
                 $multiPriceId = $val['multiPriceId'];
             }
@@ -114,7 +114,7 @@ class PayController extends BaseController
                 'goodsId' => $goodsId,
                 'customId' => $customId,
                 'sjId' => $this->sjId,
-                'title' => $goods['goodsName'],
+                'title' => $goods['name'],
                 'cover' => $goods['cover'],
                 'unitPrice' => $price,
                 'num' => $num,

+ 4 - 4
biz-hd/goods/classes/CategoryClass.php

@@ -70,12 +70,12 @@ class CategoryClass extends BaseClass
         $date = date("Y-m-d H:i:s");
         $list = [
             '花束' => [
-                ['shopImg' => '["uploads\/201906\/23\/jpg\/19062359040_12358.jpg","uploads\/201906\/23\/jpg\/19062381985_12358.jpg"]', 'price' => 588, 'content' => '暂无简介', 'sjId' => $sjId, 'createTime' => $date, 'updateTime' => $date, 'goodsName' => '相思', 'itemNumber' => stringUtil::buildRandNo($sjId) . '5',],
-                ['shopImg' => '["uploads\/201906\/23\/jpg\/19062352536_12358.jpg","uploads\/201906\/23\/jpg\/19062331132_12358.jpg","uploads\/201906\/23\/jpg\/19062380371_12358.jpg"]', 'price' => 688, 'content' => '暂无简介', 'sjId' => $sjId, 'createTime' => $date, 'updateTime' => $date, 'goodsName' => '女神', 'itemNumber' => stringUtil::buildRandNo($sjId) . '6',],
+                ['shopImg' => '["uploads\/201906\/23\/jpg\/19062359040_12358.jpg","uploads\/201906\/23\/jpg\/19062381985_12358.jpg"]', 'price' => 588, 'content' => '暂无简介', 'sjId' => $sjId, 'createTime' => $date, 'updateTime' => $date, 'name' => '相思', 'itemNumber' => stringUtil::buildRandNo($sjId) . '5',],
+                ['shopImg' => '["uploads\/201906\/23\/jpg\/19062352536_12358.jpg","uploads\/201906\/23\/jpg\/19062331132_12358.jpg","uploads\/201906\/23\/jpg\/19062380371_12358.jpg"]', 'price' => 688, 'content' => '暂无简介', 'sjId' => $sjId, 'createTime' => $date, 'updateTime' => $date, 'name' => '女神', 'itemNumber' => stringUtil::buildRandNo($sjId) . '6',],
             ],
             '花篮' => [
-                ['shopImg' => '["uploads\/201906\/23\/jpg\/19062380217_12358.jpg","uploads\/201906\/23\/jpg\/19062339442_12358.jpg","uploads\/201906\/23\/jpg\/19062382963_12358.jpg"]', 'price' => 388, 'content' => '暂无简介', 'sjId' => $sjId, 'createTime' => $date, 'updateTime' => $date, 'goodsName' => '只此一心', 'itemNumber' => stringUtil::buildRandNo($sjId) . '3',],
-                ['shopImg' => '["uploads\/201906\/23\/jpg\/19062374848_12358.jpg","uploads\/201906\/23\/jpg\/19062372687_12358.jpg","uploads\/201906\/23\/jpg\/19062341158_12358.jpg"]', 'price' => 488, 'content' => '暂无简介', 'sjId' => $sjId, 'createTime' => $date, 'updateTime' => $date, 'goodsName' => '密语时光', 'itemNumber' => stringUtil::buildRandNo($sjId) . '4',],
+                ['shopImg' => '["uploads\/201906\/23\/jpg\/19062380217_12358.jpg","uploads\/201906\/23\/jpg\/19062339442_12358.jpg","uploads\/201906\/23\/jpg\/19062382963_12358.jpg"]', 'price' => 388, 'content' => '暂无简介', 'sjId' => $sjId, 'createTime' => $date, 'updateTime' => $date, 'name' => '只此一心', 'itemNumber' => stringUtil::buildRandNo($sjId) . '3',],
+                ['shopImg' => '["uploads\/201906\/23\/jpg\/19062374848_12358.jpg","uploads\/201906\/23\/jpg\/19062372687_12358.jpg","uploads\/201906\/23\/jpg\/19062341158_12358.jpg"]', 'price' => 488, 'content' => '暂无简介', 'sjId' => $sjId, 'createTime' => $date, 'updateTime' => $date, 'name' => '密语时光', 'itemNumber' => stringUtil::buildRandNo($sjId) . '4',],
             ],
             '永生花' => [],
             '绿植' => []

+ 5 - 5
biz-hd/goods/classes/GoodsClass.php

@@ -120,10 +120,10 @@ class GoodsClass extends BaseClass
         $data['content'] = isset($data['content']) ? $data['content'] : '';
         $data['stock'] = isset($data['stock']) && is_numeric($data['stock']) && $data['stock'] >= 0 ? $data['stock'] : Goods::FULL_STOCK;
         $data['sold'] = isset($data['sold']) && is_numeric($data['sold']) && $data['sold'] >= 0 ? $data['sold'] : 0;
-        $data['py'] = stringUtil::py($data['goodsName']);
+        $data['py'] = stringUtil::py($data['name']);
         $goodsInfo = self::add($data);
         $id = $goodsInfo['id'];
-        $goodsName = $goodsInfo['goodsName'];
+        $name = $goodsInfo['name'];
         $py = $data['py'] ?? '';
 
         //处理分类
@@ -136,7 +136,7 @@ class GoodsClass extends BaseClass
         $addCategory = [];
         foreach ($categoryIdList as $categoryId) {
             $cName = $categoryData[$categoryId]['categoryName'];
-            $addCategory[] = ['gId' => $id, 'goodsName' => $goodsName, 'cId' => $categoryId, 'cName' => $cName, 'sjId' => $data['sjId'], 'py' => $py];
+            $addCategory[] = ['gId' => $id, 'name' => $name, 'cId' => $categoryId, 'cName' => $cName, 'sjId' => $data['sjId'], 'py' => $py];
         }
         GoodsCategoryClass::batchAdd($addCategory);
         // 分类商品数+1
@@ -166,7 +166,7 @@ class GoodsClass extends BaseClass
         }
         $goodsStyleList = isset($data['goodsStyleList']) && !empty($data['goodsStyleList']) ? $data['goodsStyleList'] : [];
         unset($data['goodsStyleList']);
-        $py = stringUtil::py($data['goodsName']);
+        $py = stringUtil::py($data['name']);
         //处理分类
         $sjId = $data['sjId'];
         $categoryData = CategoryClass::getCategory($sjId);
@@ -188,7 +188,7 @@ class GoodsClass extends BaseClass
         $addCategory = [];
         foreach ($categoryIdList as $categoryId) {
             $cName = $categoryData[$categoryId]['categoryName'];
-            $addCategory[] = ['gId' => $id, 'goodsName' => $data['goodsName'], 'py' => $py, 'cId' => $categoryId, 'cName' => $cName, 'sjId' => $data['sjId']];
+            $addCategory[] = ['gId' => $id, 'name' => $data['name'], 'py' => $py, 'cId' => $categoryId, 'cName' => $cName, 'sjId' => $data['sjId']];
         }
         GoodsCategoryClass::batchAdd($addCategory);
         // 分类商品数+1

+ 3 - 3
biz-hd/goods/services/GoodsService.php

@@ -82,7 +82,7 @@ class GoodsService extends BaseService
     }
 
     //保存花材组合
-    public static function saveItemGroup($order,$items,$classId,$goodsName,$adminId)
+    public static function saveItemGroup($order,$items,$classId,$name,$adminId)
     {
         $connection = Yii::$app->db;//事务处理
         $transaction = $connection->beginTransaction();
@@ -90,7 +90,7 @@ class GoodsService extends BaseService
         try{
             //新增goods  todo  还有很多字段待确定
             $goodsData = [
-                'goodsName'=>$goodsName,
+                'name'=>$name,
                 'shopImg'=>'',//?待确定
                 'price'=>$order['actPrice'],//实际支付价格
                 'adminId'=>$adminId,//
@@ -105,7 +105,7 @@ class GoodsService extends BaseService
             //新增goodsCategory
             $cateData = [
                 'gId'=>$gId,
-                'goodsName'=>$goodsName,
+                'name'=>$name,
                 'cId'=>$classId,
                 'sjId'=>$order['sjId'],
             ];

+ 6 - 6
biz-mall/goods/classes/CategoryClass.php

@@ -64,16 +64,16 @@ class CategoryClass extends BaseClass
 		$date = date("Y-m-d H:i:s");
 		$list = [
 			'花束' => [
-				['shopImg' => '["\/uploads\/201908\/01\/jpg\/19080166819_12358.jpg"]', 'price' => 188, 'content' => '暂无简介', 'sjId' => $sjId, 'createTime' => $date, 'updateTime' => $date, 'goodsName' => '天使美人', 'itemNumber' => stringUtil::buildRandNo($sjId) . '1',],
-				['shopImg' => '["\/uploads\/201908\/01\/jpg\/19080166819_12358.jpg"]', 'price' => 288, 'content' => '暂无简介', 'sjId' => $sjId, 'createTime' => $date, 'updateTime' => $date, 'goodsName' => '转角遇到爱', 'itemNumber' => stringUtil::buildRandNo($sjId) . '2',],
+				['shopImg' => '["\/uploads\/201908\/01\/jpg\/19080166819_12358.jpg"]', 'price' => 188, 'content' => '暂无简介', 'sjId' => $sjId, 'createTime' => $date, 'updateTime' => $date, 'name' => '天使美人', 'itemNumber' => stringUtil::buildRandNo($sjId) . '1',],
+				['shopImg' => '["\/uploads\/201908\/01\/jpg\/19080166819_12358.jpg"]', 'price' => 288, 'content' => '暂无简介', 'sjId' => $sjId, 'createTime' => $date, 'updateTime' => $date, 'name' => '转角遇到爱', 'itemNumber' => stringUtil::buildRandNo($sjId) . '2',],
 			],
 			'花篮' => [
-				['shopImg' => '["\/uploads\/201906\/23\/jpg\/19062380217_12358.jpg","\/uploads\/201906\/23\/jpg\/19062339442_12358.jpg","\/uploads\/201906\/23\/jpg\/19062382963_12358.jpg"]', 'price' => 388, 'content' => '暂无简介', 'sjId' => $sjId, 'createTime' => $date, 'updateTime' => $date, 'goodsName' => '只此一心', 'itemNumber' => stringUtil::buildRandNo($sjId) . '3',],
-				['shopImg' => '["\/uploads\/201906\/23\/jpg\/19062374848_12358.jpg","\/uploads\/201906\/23\/jpg\/19062372687_12358.jpg","\/uploads\/201906\/23\/jpg\/19062341158_12358.jpg"]', 'price' => 488, 'content' => '暂无简介', 'sjId' => $sjId, 'createTime' => $date, 'updateTime' => $date, 'goodsName' => '密语时光', 'itemNumber' => stringUtil::buildRandNo($sjId) . '4',],
+				['shopImg' => '["\/uploads\/201906\/23\/jpg\/19062380217_12358.jpg","\/uploads\/201906\/23\/jpg\/19062339442_12358.jpg","\/uploads\/201906\/23\/jpg\/19062382963_12358.jpg"]', 'price' => 388, 'content' => '暂无简介', 'sjId' => $sjId, 'createTime' => $date, 'updateTime' => $date, 'name' => '只此一心', 'itemNumber' => stringUtil::buildRandNo($sjId) . '3',],
+				['shopImg' => '["\/uploads\/201906\/23\/jpg\/19062374848_12358.jpg","\/uploads\/201906\/23\/jpg\/19062372687_12358.jpg","\/uploads\/201906\/23\/jpg\/19062341158_12358.jpg"]', 'price' => 488, 'content' => '暂无简介', 'sjId' => $sjId, 'createTime' => $date, 'updateTime' => $date, 'name' => '密语时光', 'itemNumber' => stringUtil::buildRandNo($sjId) . '4',],
 			],
 			'永生花' => [
-				['shopImg' => '["\/uploads\/201906\/23\/jpg\/19062359040_12358.jpg","\/uploads\/201906\/23\/jpg\/19062381985_12358.jpg"]', 'price' => 588, 'content' => '暂无简介', 'sjId' => $sjId, 'createTime' => $date, 'updateTime' => $date, 'goodsName' => '相思', 'itemNumber' => stringUtil::buildRandNo($sjId) . '5',],
-				['shopImg' => '["\/uploads\/201906\/23\/jpg\/19062352536_12358.jpg","\/uploads\/201906\/23\/jpg\/19062331132_12358.jpg","\/uploads\/201906\/23\/jpg\/19062380371_12358.jpg"]', 'price' => 688, 'content' => '暂无简介', 'sjId' => $sjId, 'createTime' => $date, 'updateTime' => $date, 'goodsName' => '女神', 'itemNumber' => stringUtil::buildRandNo($sjId) . '6',],
+				['shopImg' => '["\/uploads\/201906\/23\/jpg\/19062359040_12358.jpg","\/uploads\/201906\/23\/jpg\/19062381985_12358.jpg"]', 'price' => 588, 'content' => '暂无简介', 'sjId' => $sjId, 'createTime' => $date, 'updateTime' => $date, 'name' => '相思', 'itemNumber' => stringUtil::buildRandNo($sjId) . '5',],
+				['shopImg' => '["\/uploads\/201906\/23\/jpg\/19062352536_12358.jpg","\/uploads\/201906\/23\/jpg\/19062331132_12358.jpg","\/uploads\/201906\/23\/jpg\/19062380371_12358.jpg"]', 'price' => 688, 'content' => '暂无简介', 'sjId' => $sjId, 'createTime' => $date, 'updateTime' => $date, 'name' => '女神', 'itemNumber' => stringUtil::buildRandNo($sjId) . '6',],
 			],
 			'绿植' => []
 		];

+ 3 - 3
biz-mall/goods/classes/GoodsClass.php

@@ -112,7 +112,7 @@ class GoodsClass extends BaseClass
         $data['sold'] = isset($data['sold']) && is_numeric($data['sold']) && $data['sold'] >= 0 ? $data['sold'] : 0;
         $goodsInfo = self::add($data);
         $id = $goodsInfo['id'];
-        $goodsName = $goodsInfo['goodsName'];
+        $name = $goodsInfo['name'];
 
         //处理分类
         $hasCategoryIdList = CategoryClass::getCategoryIds($sjId);
@@ -122,7 +122,7 @@ class GoodsClass extends BaseClass
         }
         $addCategory = [];
         foreach ($categoryIdList as $categoryId) {
-            $addCategory[] = ['gId' => $id, 'goodsName' => $goodsName, 'cId' => $categoryId, 'sjId' => $data['sjId']];
+            $addCategory[] = ['gId' => $id, 'name' => $name, 'cId' => $categoryId, 'sjId' => $data['sjId']];
         }
         GoodsCategoryClass::batchAdd($addCategory);
         //处理款式
@@ -158,7 +158,7 @@ class GoodsClass extends BaseClass
         GoodsCategoryClass::delGoodsCategory($id);
         $addCategory = [];
         foreach ($categoryIdList as $categoryId) {
-            $addCategory[] = ['gId' => $id, 'goodsName' => $data['goodsName'], 'cId' => $categoryId, 'sjId' => $data['sjId']];
+            $addCategory[] = ['gId' => $id, 'name' => $data['name'], 'cId' => $categoryId, 'sjId' => $data['sjId']];
         }
         GoodsCategoryClass::batchAdd($addCategory);
 

+ 4 - 4
console/controllers/GoodsController.php

@@ -18,8 +18,8 @@ class GoodsController extends Controller
         $list = GoodsClass::getAllByCondition([], null, '*');
         if (!empty($list)) {
             foreach ($list as $goods) {
-                $goodsName = $goods['goodsName'];
-                $py = stringUtil::py($goodsName);
+                $name = $goods['name'];
+                $py = stringUtil::py($name);
                 $id = $goods['id'];
                 GoodsClass::updateById($id, ['py' => $py]);
             }
@@ -28,8 +28,8 @@ class GoodsController extends Controller
         $list = GoodsCategoryClass::getAllByCondition([], null, '*');
         if (!empty($list)) {
             foreach ($list as $key => $val) {
-                $goodsName = $val['goodsName'];
-                $py = stringUtil::py($goodsName);
+                $name = $val['name'];
+                $py = stringUtil::py($name);
                 $id = $val['id'];
                 GoodsCategoryClass::updateById($id, ['py' => $py]);
             }

+ 3 - 3
console/controllers/UpgradeController.php

@@ -1237,7 +1237,7 @@ ALTER TABLE `xhMerchantExtend` ADD freeDistance TINYINT NOT NULL DEFAULT 0 COMME
 UPDATE `xhMerchantExtend` SET `freeDistance`=5;";
 		Yii::$app->db->createCommand($sql)->execute($sql);
 		
-		$sql = "ALTER TABLE `xhGoodsCategory` ADD `goodsName` VARCHAR(200) NOT NULL DEFAULT '' COMMENT '商品名称' AFTER `gId`;";
+		$sql = "ALTER TABLE `xhGoodsCategory` ADD `name` VARCHAR(200) NOT NULL DEFAULT '' COMMENT '商品名称' AFTER `gId`;";
 		Yii::$app->db->createCommand($sql)->execute($sql);
 		
 		//确认密码判断字段 ssh 2020.3.12
@@ -1572,8 +1572,8 @@ UPDATE `xhUserAsset` SET `member`=0 WHERE `member`=-1;";
 		if (!empty($goodsList)) {
 			foreach ($goodsList as $goods) {
 				$id = $goods['id'];
-				$currentGoodsName = $goods['goodsName'];
-				GoodsCategoryService::updateByCondition(['gId' => $id], ['goodsName' => $currentGoodsName]);
+				$currentname = $goods['name'];
+				GoodsCategoryService::updateByCondition(['gId' => $id], ['name' => $currentname]);
 			}
 		}
 		

+ 5 - 0
sql.txt

@@ -304,6 +304,11 @@ ALTER TABLE xhStatCgGhs ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFT
 ALTER TABLE xhStatCgGhsMonth ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `shopId`;
 ALTER TABLE xhStatCgMonth ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `shopId`;
 
+ALTER TABLE xhStatKd ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `shopId`;
+ALTER TABLE xhStatKdMonth ADD mainId INT NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `shopId`;
+
+ALTER TABLE xhGoods CHANGE `goodsName` `name` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '商品名称';
+
 ============ 批发零售绑定关系 shish 20220314