Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-ghs/controllers/PtItemController.php

@@ -22,7 +22,8 @@ class PtItemController extends BaseController
                 $where['name'] = ['like', $name];
             }
         }
-        $list = PtItemClass::getItemList($where, true);
+        $sjId = $this->sjId;
+        $list = PtItemClass::getItemList($where, true,$sjId);
         util::success($list);
     }
 

app-ghs/controllers/ShopExpressController.php

@@ -2,16 +2,20 @@
 
 namespace ghs\controllers;
 
+use biz\shop\classes\ShopExpressClass;
+use biz\sj\classes\SjExpressClass;
 use common\components\util;
 use Yii;
 
 class ShopExpressController extends BaseController
 {
 
-    //达达快递信息
+    //达达快递信息 mend
     public function actionDadaInfo()
     {
-        $respond = ['sjId' => 1105, 'shopNo' => '511-3244'];
+        $sjId = SjExpressClass::getSourceId($this->sjId);
+        $shopNo = ShopExpressClass::getShopNo($this->sjId,$this->shopId);
+        $respond = ['sjId' => $sjId, 'shopNo' => $shopNo];
         util::success($respond);
     }
 
@@ -19,8 +23,16 @@ class ShopExpressController extends BaseController
     public function actionUpdateDada()
     {
         $get = Yii::$app->request->get();
-        $sjId = $get['sjId'] ?? '';
+        $sourceId = $get['sjId'] ?? '';
         $shopNo = $get['shopNo'] ?? '';
+        if(empty($sourceId) ){
+            util::fail("请输入商户ID");
+        }
+        if(empty($shopNo) ){
+            util::fail("请输入门店ID");
+        }
+        SjExpressClass::updateSourceId($this->sjId,$sourceId);
+        ShopExpressClass::updateShopNo($this->sjId,$this->shopId,$shopNo);
         util::complete();
     }
 

biz-ghs/item/classes/ItemClass.php

@@ -68,9 +68,13 @@ class ItemClass extends BaseClass
     }
 
     //根据花材分类ID，获取itemIds
-    public static function getItemIdsByClassId($classId)
+    public static function getItemIdsByClassId($sjId,$classId)
     {
-        $data = self::getAllList("itemId", ['classId' => $classId]);
+        $where = [
+            'classId'=>$classId,
+            'merchantId'=>$sjId,
+        ];
+        $data = self::getAllList("itemId",$where);
         if ($data) {
             $data = array_column($data, 'itemId');
         }

biz/item/classes/PtItemClass.php

@@ -4,17 +4,22 @@ namespace biz\item\classes;
 
 use biz\base\classes\BaseClass;
 use common\components\imgUtil;
-
+use bizGhs\item\classes\ItemClass;
 class PtItemClass extends BaseClass
 {
 
     public static $baseFile = '\biz\item\models\PtItem';
 
     //列表数据
-    public static function getItemList($where, $showSelect = false)
+    public static function getItemList($where, $showSelect = false,$sjId = '')
     {
         $data = self::getList('*', $where, 'id DESC');
         $list = $data['list'];
+        $sjItemIds = [];
+        if($showSelect && $sjId){
+            $sjItemIds = ItemClass::getGhsItemAll($sjId);
+            $sjItemIds = array_column($sjItemIds, 'itemId');
+        }
         if ($list) {
             $prefix = imgUtil::getPrefix();
             foreach ($list as $k => $v) {
@@ -23,7 +28,11 @@ class PtItemClass extends BaseClass
                 $list[$k]['smallUnit'] = self::getUnitName($v['smallUnit']);
                 if ($showSelect) {
                     //1未选 2已选
-                    $num = rand(1,2);
+                    if(in_array($v['id'],$sjItemIds)){
+                        $num = 2;
+                    }else{
+                        $num = 1;
+                    }
                     $list[$k]['select'] = $num;
                 }
             }
@@ -42,4 +51,4 @@ class PtItemClass extends BaseClass
         return $map[$unit] ?? '支';
     }
 
-}
+}

biz/shop/classes/ShopExpressClass.php

@@ -22,9 +22,24 @@ class ShopExpressClass extends BaseClass
         ];
         $res = self::getByCondition($where);
         if(empty($res)){
-            util::fail("门店不存在");
+            //写入一条
+            $data = $where;
+            $data['shopNo'] = '';
+            self::add($data);
+            return '';
         }
         return $res['shopNo'];
     }
 
+    public static function updateShopNo($sjId,$shopId,$shopNo,$label ='dada')
+    {
+        $where = [
+            'sJid'=>$sjId,
+            'shopId'=>$shopId,
+            'label'=>$label
+        ];
+        self::getShopNo($sjId,$label);
+        self::updateByCondition($where,['shopNo'=>$shopNo]);
+        return true;
+    }
 }

biz/sj/classes/SjExpressClass.php

@@ -19,8 +19,23 @@ class SjExpressClass extends BaseClass
         ];
         $res = self::getByCondition($where);
         if(empty($res)){
-            util::fail("门店不存在");
+            //写入一条
+            $data = $where;
+            $data['sourceId'] = '';
+            self::add($data);
+            return '';
         }
         return $res['sourceId'];
     }
+
+    public static function updateSourceId($sjId,$sourceId,$label ='dada')
+    {
+        $where = [
+            'sJid'=>$sjId,
+            'label'=>$label
+        ];
+        self::getSourceId($sjId,$label);
+        self::updateByCondition($where,['sourceId'=>$sourceId]);
+        return true;
+    }
 }

common/components/dada/dada.php

@@ -192,6 +192,9 @@ class dada
 
     public static function getConfig($sourceId)
     {
+        if(empty($sourceId)){
+            util::fail("暂不支持配送，请联系客服");
+        }
         $config = new config();
         $online = Yii::$app->params['dadaOnline'];
         $appKey = Yii::$app->params['dadaAppKey'];

sql.sql

@@ -1929,4 +1929,20 @@ ALTER TABLE `xhItem` CHANGE `unitCost` `cost` DECIMAL(9,2) NOT NULL DEFAULT '0.0
 ALTER TABLE `xhItem` CHANGE `unitAddPrice` `addPrice` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '每扎(大单位)加价';
 ALTER TABLE `xhGhsItem` CHANGE `unitWeight` `weight` FLOAT(10,2) NOT NULL DEFAULT '0.00' COMMENT '每扎(大单位)重量(公斤)';
 ALTER TABLE `xhGhsItem` CHANGE `unitCost` `cost` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '每扎(大单位)成本价';
-ALTER TABLE `xhGhsItem` CHANGE `unitAddPrice` `addPrice` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '每扎(大单位)加价';
+ALTER TABLE `xhGhsItem` CHANGE `unitAddPrice` `addPrice` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '每扎(大单位)加价';
+
+
+=======linqh 2021-04-01
+===
+
+ALTER TABLE `xhPtItem`
+CHANGE COLUMN `unitWeight` `weight`  decimal(9,2) NOT NULL DEFAULT 0.00 COMMENT '大单位重量，每扎多少公斤' AFTER `unitNum`,
+CHANGE COLUMN `unitCost` `cost`  decimal(9,2) NOT NULL DEFAULT 0.00 COMMENT '大单位采购价，每扎成本价，采购价' AFTER `weight`,
+CHANGE COLUMN `unitAddPrice` `addPrice`  decimal(9,2) NOT NULL DEFAULT 0.00 COMMENT '大单位加价，每扎加价' AFTER `cost`;
+
+ALTER TABLE `xhPtItem`
+CHANGE COLUMN `unitNum` `ratio`  tinyint(4) NOT NULL DEFAULT 0 COMMENT '大小单位转换比例，每扎多少支' AFTER `classId`;
+
+ALTER TABLE `xhPtItem`
+MODIFY COLUMN `ratio`  tinyint(4) NOT NULL DEFAULT 1 COMMENT '大小单位转换比例，每扎多少支' AFTER `classId`;
+