product mainId

app-ghs/controllers/CheckOrderController.php

@@ -124,7 +124,7 @@ class CheckOrderController extends BaseController
             util::fail('花材格式不正确');
         }
         //判断花材格式，是否属于当前门店
-        ProductClass::valid($ghsItemInfo, $this->shopId);
+        ProductClass::valid($ghsItemInfo, $this->mainId);
         $post['itemInfo'] = $ghsItemInfo;
         if ($update === true) {
             //编辑

app-ghs/controllers/OrderController.php

@@ -636,7 +636,7 @@ class OrderController extends BaseController
         $transaction = $connection->beginTransaction();
         try {
             //判断花材有效性
-            ProductClass::valid($productList, $this->shopId);
+            ProductClass::valid($productList, $this->mainId);
             $post['product'] = $productList;
             //商家开单到时间会自动标记为欠款，所以360天内不过期，以保证足够时间标记欠款，具体参数查看dict local_gys_kd_auto_set_debt_time
             $post['deadline'] = date("Y-m-d H:i:s", strtotime('+360 day'));
@@ -717,7 +717,7 @@ class OrderController extends BaseController
         $transaction = $connection->beginTransaction();
         try {
             //判断花材有效性
-            ProductClass::valid($productList, $this->shopId);
+            ProductClass::valid($productList, $this->mainId);
             $post['product'] = $productList;
 
             //商家开单订单有效期，到期记欠款

app-ghs/controllers/OrderItemController.php

@@ -23,7 +23,7 @@ class OrderItemController extends BaseController
         $product = $post['product'] ?? '[]';
         $product = json_decode($product, true);
         //检查花材是否都是同家门店的
-        ProductClass::valid($product, $this->shopId);
+        ProductClass::valid($product, $this->mainId);
 
         $info = OrderService::getOrderInfo($id);
         OrderClass::valid($info, $this->shopId);

app-ghs/controllers/PurchaseOrderController.php

@@ -37,7 +37,7 @@ class PurchaseOrderController extends BaseController
         //合并
         $ghsItemInfo = PurchaseOrderClass::mergeItemInfo($ghsItemInfo);
         //判断花材格式，是否属于当前门店
-        ProductClass::valid($ghsItemInfo, $this->shopId);
+        ProductClass::valid($ghsItemInfo, $this->mainId);
         //获取供应商信息
         $ghsId = $post['ghsId'];
         if (empty($ghsId)) {
@@ -79,7 +79,7 @@ class PurchaseOrderController extends BaseController
             $where['status'] = $orderStatus;
         }
         $ghsId = $get['ghsId'] ?? 0;
-        if(!empty($ghsId)){
+        if (!empty($ghsId)) {
             $where['ghsId'] = $ghsId;
         }
         $where['sjId'] = $this->sjId;

app-ghs/controllers/StockOutController.php

@@ -65,8 +65,7 @@ class StockOutController extends BaseController
         }
         ShopClass::valid($inShop, $this->sjId);
 
-
-        ProductClass::valid($ghsItemInfo, $this->shopId);
+        ProductClass::valid($ghsItemInfo, $this->mainId);
         //判断花材里的信息
         foreach ($ghsItemInfo as $v) {
             $bigNum = $v['bigNum'] ?? 0;

app-ghs/controllers/WastageController.php

@@ -2,11 +2,13 @@
 //损耗
 namespace ghs\controllers;
 
+use common\components\dict;
 use Yii;
 use bizGhs\order\classes\StockWastageOrderClass;
 use common\components\util;
 use bizGhs\product\classes\ProductClass;
 
+//已中央化
 class WastageController extends BaseController
 {
 
@@ -34,7 +36,29 @@ class WastageController extends BaseController
         if (empty($productList)) {
             util::fail('请选择花材');
         }
-        //判断花材里的信息
+
+        //有unitType数据，说明是收银台传过来的数据，转换成和手机端结构一致
+        $hasUnitType = array_column($productList, 'unitType');
+        if (!empty($hasUnitType)) {
+            $newProductList = [];
+            foreach ($productList as $key => $val) {
+                $unitType = $val['unitType'] ?? 0;
+                $bigNum = 0;
+                $smallNum = 0;
+                $num = $val['num'] ?? 0;
+                $id = $val['productId'] ?? 0;
+                if ($unitType == dict::getDict('unitType', 'big')) {
+                    $bigNum = $num;
+                } else {
+                    $smallNum = $num;
+                }
+                $newProductList[] = ['id' => $id, 'bigNum' => $bigNum, 'smallNum' => $smallNum, 'classId' => 0, 'itemId' => 0];
+            }
+            //[{"productId":12233,"num":1,"unitType":0}]
+            //[{"id":"13051","bigNum":1,"smallNum":0,"classId":"1259","itemId":"3713"},{"id":"12677","bigNum":1,"smallNum":0,"classId":"1259","itemId":"1035"}]
+            $productList = $newProductList;
+        }
+
         foreach ($productList as $v) {
             $bigNum = $v['bigNum'] ?? 0;
             $smallNum = $v['smallNum'] ?? 0;
@@ -46,7 +70,7 @@ class WastageController extends BaseController
         $transaction = $connection->beginTransaction();
         try {
             //判断花材有效性
-            ProductClass::valid($productList, $this->shopId);
+            ProductClass::valid($productList, $this->mainId);
             $post['product'] = $productList;
             $return = StockWastageOrderClass::addOrder($post);
             $transaction->commit();

app-hd/controllers/CheckOrderController.php

@@ -27,8 +27,8 @@ class CheckOrderController extends BaseController
     //订单详情 2021.1.22 linqh
     public function actionDetail()
     {
-        $orderSn = Yii::$app->request->get('orderSn','');
-        $orderData = CheckOrderClass::getOrderDetail($orderSn,$this->shopId);
+        $orderSn = Yii::$app->request->get('orderSn', '');
+        $orderData = CheckOrderClass::getOrderDetail($orderSn, $this->shopId);
         util::success($orderData);
     }
 
@@ -41,7 +41,7 @@ class CheckOrderController extends BaseController
         $post['adminId'] = $this->adminId;
         //盘点是否有未处理的草稿，有的话先处理之前的草稿??
         //todo
-        $this->saveOrder($post,false,false);
+        $this->saveOrder($post, false, false);
 
     }
 
@@ -53,7 +53,7 @@ class CheckOrderController extends BaseController
         $post['shopId'] = $this->shopId;
         $post['adminId'] = $this->adminId;
 
-        $this->saveOrder($post,true,false);
+        $this->saveOrder($post, true, false);
     }
 
     //编辑草稿 ，继续保存草稿
@@ -63,12 +63,12 @@ class CheckOrderController extends BaseController
         $post['sjId'] = $this->sjId;
         $post['shopId'] = $this->shopId;
         $post['adminId'] = $this->adminId;
-        $orderSn = $post['orderSn']??'';
-        $orderData = CheckOrderClass::orderExist($orderSn,$this->shopId);
-        if($orderData['status'] != CheckOrderClass::STATUS_DRAFT){
+        $orderSn = $post['orderSn'] ?? '';
+        $orderData = CheckOrderClass::orderExist($orderSn, $this->shopId);
+        if ($orderData['status'] != CheckOrderClass::STATUS_DRAFT) {
             util::fail("订单不存在");
         }
-        $this->saveOrder($post,true,true);
+        $this->saveOrder($post, true, true);
 
     }
 
@@ -79,37 +79,37 @@ class CheckOrderController extends BaseController
         $post['sjId'] = $this->sjId;
         $post['shopId'] = $this->shopId;
         $post['adminId'] = $this->adminId;
-        $orderSn = $post['orderSn']??'';
-        $orderData = CheckOrderClass::orderExist($orderSn,$this->shopId);
-        if($orderData['status'] != CheckOrderClass::STATUS_DRAFT){
+        $orderSn = $post['orderSn'] ?? '';
+        $orderData = CheckOrderClass::orderExist($orderSn, $this->shopId);
+        if ($orderData['status'] != CheckOrderClass::STATUS_DRAFT) {
             util::fail("订单不存在");
         }
-        $this->saveOrder($post,false,true);
+        $this->saveOrder($post, false, true);
     }
 
-    protected function saveOrder($post,$draft=false,$update=false)
+    protected function saveOrder($post, $draft = false, $update = false)
     {
-        $ghsItemInfo = $post['itemInfo']??'';
-        if(empty($ghsItemInfo)){
+        $ghsItemInfo = $post['itemInfo'] ?? '';
+        if (empty($ghsItemInfo)) {
             util::fail('请选择花材');
         }
-        $ghsItemInfo = json_decode($ghsItemInfo,true); // [{productId:0,bigNum:1,smallNum:0}]
-        if(!is_array($ghsItemInfo)){
+        $ghsItemInfo = json_decode($ghsItemInfo, true); // [{productId:0,bigNum:1,smallNum:0}]
+        if (!is_array($ghsItemInfo)) {
             util::fail('花材格式不正确');
         }
         //判断花材格式，是否属于当前门店
-        ProductClass::valid($ghsItemInfo,$this->shopId);
+        ProductClass::valid($ghsItemInfo, $this->mainId);
         $post['itemInfo'] = $ghsItemInfo;
-        if($update===true){
+        if ($update === true) {
             //编辑
-            $order = CheckOrderClass::opOrder($post,$draft,$update);
-        }else{
-            $order = CheckOrderClass::opOrder($post,$draft,$update);
+            $order = CheckOrderClass::opOrder($post, $draft, $update);
+        } else {
+            $order = CheckOrderClass::opOrder($post, $draft, $update);
         }
 
-        if($order){
+        if ($order) {
             util::success($order);
-        }else{
+        } else {
             util::fail();
         }
     }

app-hd/controllers/GroupController.php

@@ -21,4 +21,13 @@ class GroupController extends BaseController
         util::success($list);
     }
 
+    //组合详情 shish 20220318
+    public function actionDetail()
+    {
+        $id = Yii::$app->request->get('id');
+        $group = GroupClass::getById($id, true);
+        GroupClass::valid($group, $this->mainId);
+        util::success(['info' => $group]);
+    }
+
 }

app-hd/controllers/PurchaseController.php

@@ -69,7 +69,7 @@ class PurchaseController extends BaseController
             $product = $post['product'] ?? '';
             $productList = json_decode($product, true);
             //判断product数据是不是同个供应商的
-            ProductClass::valid($productList, $currentShopId);
+            ProductClass::valid($productList, $this->mainId);
             $post['product'] = $productList;
             $post['sendCost'] = isset($post['sendCost']) && is_numeric($post['sendCost']) ? $post['sendCost'] : 0;
 

app-hd/controllers/WastageController.php

@@ -0,0 +1,85 @@
+<?php
+
+namespace hd\controllers;
+
+use bizGhs\order\classes\StockWastageOrderClass;
+use bizGhs\product\classes\ProductClass;
+use common\components\util;
+use Yii;
+
+//已中央化 ssh 20220319
+class WastageController extends BaseController
+{
+
+    public $guestAccess = [];
+
+    //新增损耗
+    public function actionCreateOrder()
+    {
+        $shopAdmin = $this->shopAdmin;
+        if (isset($shopAdmin->super) == false || $shopAdmin->super != 1) {
+            util::fail('超管才能报损');
+        }
+
+        $post = Yii::$app->request->post();
+        $post['shopId'] = $this->shopId;
+        $post['sjId'] = $this->sjId;
+        $post['mainId'] = $this->mainId;
+        $post['shopAdminId'] = $this->shopAdminId;
+        $shopAdmin = $this->shopAdmin;
+        $adminName = $shopAdmin['name'] ?? '';
+        $post['shopAdminName'] = $adminName;
+        $productJson = $post['product'] ?? '';
+        if (empty($productJson)) {
+            util::fail('请选择花材');
+        }
+        $productList = json_decode($productJson, true);
+        if (empty($productList)) {
+            util::fail('请选择花材');
+        }
+
+        //有unitType数据，说明是收银台传过来的数据，转换成和手机端结构一致
+        $hasUnitType = array_column($productList, 'unitType');
+        if (!empty($hasUnitType)) {
+
+        }
+
+        foreach ($productList as $v) {
+            $bigNum = $v['bigNum'] ?? 0;
+            $smallNum = $v['smallNum'] ?? 0;
+            if ($bigNum <= 0 && $smallNum <= 0) {
+                util::fail('花材数量不能为0');
+            }
+        }
+        $connection = Yii::$app->db;//事务处理
+        $transaction = $connection->beginTransaction();
+        try {
+            ProductClass::valid($productList, $this->mainId);
+            $post['product'] = $productList;
+            $return = StockWastageOrderClass::addOrder($post);
+            $transaction->commit();
+            util::success($return);
+        } catch (\Exception $e) {
+            $transaction->rollBack();
+            Yii::info("报损失败原因：" . $e->getMessage());
+            util::fail('报损保存失败');
+        }
+    }
+
+    //列表
+    public function actionList()
+    {
+        $where = [];
+        $where['mainId'] = $this->mainId;
+        $list = StockWastageOrderClass::getOrderList($where);
+        util::success($list);
+    }
+
+    public function actionDetail()
+    {
+        $orderSn = Yii::$app->request->get('orderSn', '');
+        $orderData = StockWastageOrderClass::getOrderDetail($orderSn, $this->mainId);
+        util::success($orderData);
+    }
+
+}

biz-ghs/order/classes/OrderClass.php

@@ -1024,7 +1024,7 @@ class OrderClass extends BaseClass
             $recordData['productId'] = $v['productId'];
             $recordData['orderSn'] = $order->orderSn;
             $recordData['relateName'] = $order->customName ?? '';
-            StockRecordService::addSellStockOrderCancelRecord($recordData);
+            StockRecordClass::addSellStockOrderCancelRecord($recordData);
         }
         return $order;
     }

biz-ghs/order/classes/StockWastageOrderClass.php

@@ -53,6 +53,7 @@ class StockWastageOrderClass extends BaseClass
         $data['bigNum'] = $sumNum['bigNum'];
         $data['smallNum'] = $sumNum['smallNum'];
         $data['remark'] = $post['remark'] ?? '';
+        $data['mainId'] = $post['mainId'] ?? 0;
 
         try {
             //写入订单表
@@ -97,9 +98,9 @@ class StockWastageOrderClass extends BaseClass
     }
 
     //2021.1.23 linqh 订单详情
-    public static function getOrderDetail($orderSn, $shopId)
+    public static function getOrderDetail($orderSn, $mainId)
     {
-        $orderData = self::orderExist(['orderSn' => $orderSn, 'shopId' => $shopId]);
+        $orderData = self::orderExist(['orderSn' => $orderSn, 'mainId' => $mainId]);
         $orderInfo = StockWastageOrderItemClass::getOrderItemDetail($orderSn);
         $itemData = [];
         if ($orderInfo) {

biz-ghs/order/services/OrderService.php

@@ -36,9 +36,9 @@ class OrderService extends BaseService
     public static function createFinishOrder($data, $custom, $hasPay = 1)
     {
 
-        //收银台过来的数据结构和APP端不一样，先进行转换一下
-        $requestSide = Yii::$app->request->post('requestSide', 0);
-        if ($requestSide == 1) {
+        //有unitType数据，说明是收银台传过来的数据，转换成和手机端结构一致
+        $hasUnitType = array_column($data['product'], 'unitType');
+        if (!empty($hasUnitType)) {
             $newProductData = [];
             foreach ($data['product'] as $productItem) {
                 $unitType = $productItem['unitType'] ?? 0;
@@ -54,13 +54,18 @@ class OrderService extends BaseService
                     $bigNum = '';
                     $smallNum = $num;
                 }
-                $newProductData[] = ['productId' => (int)$productId, 'bigNum' => (int)$bigNum, 'smallNum' => (int)$smallNum,
-                    'classId' => (int)$classId, 'itemId' => (int)$itemId, 'price' => floatval($price)];
+                $newProductData[] = [
+                    'productId' => (int)$productId,
+                    'bigNum' => (int)$bigNum,
+                    'smallNum' => (int)$smallNum,
+                    'classId' => (int)$classId,
+                    'itemId' => (int)$itemId,
+                    'price' => floatval($price),
+                ];
             }
             $data['product'] = $newProductData;
         }
 
-
         //供应商销售单
         $returnOrder = OrderClass::addOrder($data);
         $saleId = $returnOrder->id ?? 0;

biz-ghs/product/classes/ProductClass.php

@@ -502,13 +502,13 @@ class ProductClass extends BaseClass
     }
 
     //有效花材判断，包括id有效、同个门店等 ssh 2021.1.19
-    public static function valid($list, $shopId)
+    public static function valid($list, $mainId)
     {
         $ids = array_unique(array_filter(array_column($list, 'productId')));
         $productList = self::getByIds($ids, null, 'id');
         if (!empty($productList)) {
             foreach ($productList as $product) {
-                if (isset($product['shopId']) == false || $product['shopId'] != $shopId) {
+                if (isset($product['mainId']) == false || $product['mainId'] != $mainId) {
                     util::fail('只能选择同一家的商品下单');
                 }
             }

biz-hd/group/classes/GroupClass.php

@@ -5,12 +5,24 @@ namespace bizHd\group\classes;
 
 use bizHd\base\classes\BaseClass;
 use common\components\imgUtil;
+use common\components\util;
 
 class GroupClass extends BaseClass
 {
 
     public static $baseFile = '\bizHd\group\models\Group';
 
+    public static function valid($group, $mainId)
+    {
+        if (empty($group)) {
+            util::fail('没有找到组合');
+        }
+        if ($group->mainId != $mainId) {
+            util::fail('组合没有权限访问');
+        }
+        return true;
+    }
+
     public static function getGroupList($where)
     {
         $order = 'num DESC,addTime DESC';

biz-hd/group/models/GroupGoods.php

@@ -7,7 +7,7 @@ class GroupGoods extends Base
 
     public static function tableName()
     {
-        return 'xhGroup';
+        return 'xhGroupGoods';
     }
 
 }

biz-hd/group/models/GroupItem.php

@@ -7,7 +7,7 @@ class GroupItem extends Base
 
     public static function tableName()
     {
-        return 'xhGroup';
+        return 'xhGroupItem';
     }
 
 }

biz-hd/order/classes/OrderClass.php

@@ -107,7 +107,8 @@ class OrderClass extends BaseClass
         if (empty($order)) {
             return [];
         }
-        $order['goodsInfoList'] = OrderGoodsClass::getGoodsListById($id);
+        $sn = $order['orderSn'] ?? '';
+        $order['goodsInfoList'] = OrderGoodsClass::getListBySn($sn);
         return $order;
     }
 

biz-hd/order/classes/OrderGoodsClass.php

@@ -65,6 +65,19 @@ class OrderGoodsClass extends BaseClass
         return $arr;
     }
 
+    public static function getListBySn($sn)
+    {
+        $arr = self::getAllByCondition(['orderSn' => $sn], null, '*');
+        if (empty($arr)) {
+            return [];
+        }
+        foreach ($arr as $key => $val) {
+            $val = business::formatOrderGoodsCover($val);
+            $arr[$key] = $val;
+        }
+        return $arr;
+    }
+
     //批量取订单 ssh 2020.1.2
     public static function getGoodsListByOrderSns($sns)
     {

biz-hd/order/services/OrderService.php

@@ -52,23 +52,23 @@ class OrderService extends BaseService
             $groupGoodsList = GroupGoodsClass::getAllByCondition(['groupId' => $groupId], null, '*');
             if (!empty($groupGoodsList)) {
                 foreach ($groupGoodsList as $thisGoods) {
-                    $id = $thisGoods['id'] ?? 0;
+                    $id = $thisGoods['goodsId'] ?? 0;
                     $property = dict::getDict('property', 'goods');
                     $num = $thisGoods['num'] ?? 0;
                     $unitType = 0;
                     $unitPrice = $thisGoods['unitPrice'] ?? 0;
-                    $product[] = ['id' => $id, 'num' => $num, 'unitType' => $unitType, 'unitPrice' => $unitPrice, 'property' => $property];
+                    $product[] = ['productId' => $id, 'num' => $num, 'unitType' => $unitType, 'unitPrice' => $unitPrice, 'property' => $property];
                 }
             }
             $groupItemList = GroupItemClass::getAllByCondition(['groupId' => $groupId], null, '*');
             if (!empty($groupItemList)) {
                 foreach ($groupItemList as $thisItem) {
-                    $id = $thisGoods['id'] ?? 0;
+                    $id = $thisItem['itemId'] ?? 0;
                     $property = dict::getDict('property', 'item');
                     $unitType = $thisItem['unitType'] ?? 0;
                     $num = $thisItem['num'] ?? 0;
                     $unitPrice = $thisItem['unitPrice'] ?? 0;
-                    $product[] = ['id' => $id, 'num' => $num, 'unitType' => $unitType, 'unitPrice' => $unitPrice, 'property' => $property];
+                    $product[] = ['productId' => $id, 'num' => $num, 'unitType' => $unitType, 'unitPrice' => $unitPrice, 'property' => $property];
                 }
             }
         }
@@ -79,7 +79,7 @@ class OrderService extends BaseService
         $currentGoodsIds = [];
         $currentItemIds = [];
         foreach ($product as $key => $val) {
-            $currentId = $val['id'] ?? 0;
+            $currentId = $val['productId'] ?? 0;
             $property = $val['property'];
             if ($property == dict::getDict('property', 'goods')) {
                 $currentGoodsIds[] = $currentId;
@@ -114,10 +114,9 @@ class OrderService extends BaseService
             $property = $val['property'];
             $unitPrice = $val['unitPrice'] ?? 0;
             $unitType = $val['unitType'] ?? 0;
-            $currentId = $val['id'] ?? 0;
+            $currentId = $val['productId'] ?? 0;
             $num = $val['num'] ?? 0;
             if ($property == dict::getDict('property', 'goods')) {
-                $goodsId = $val['id'] ?? 0;
                 $name = $goodsInfo[$currentId]['name'] ?? '';
                 $cover = $goodsInfo[$currentId]['cover'] ?? '';
                 if (!empty($groupCover)) {
@@ -129,7 +128,7 @@ class OrderService extends BaseService
                 }
                 $currentGoodsData = [
                     'orderSn' => $orderSn,
-                    'goodsId' => $goodsId,
+                    'goodsId' => $currentId,
                     'customId' => $customId,
                     'hdId' => $hdId,
                     'sjId' => $sjId,
@@ -144,14 +143,13 @@ class OrderService extends BaseService
                 //库存变化在这里
                 OrderGoodsClass::addData($currentGoodsData);
                 $groupGoodsData[] = [
-                    'goodsId' => $goodsId,
+                    'goodsId' => $currentId,
                     'num' => $num,
                     'name' => $name,
                     'unitPrice' => $unitPrice,
                 ];
             }
             if ($property == dict::getDict('property', 'item')) {
-                $itemId = $val['id'] ?? 0;
                 $name = $itemInfo[$currentId]['name'] ?? '';
                 $cover = $itemInfo[$currentId]['cover'] ?? '';
                 if (!empty($groupCover)) {
@@ -182,7 +180,7 @@ class OrderService extends BaseService
                     'unitPrice' => $unitPrice,
                     'num' => $num,
                     'orderSn' => $orderSn,
-                    'itemId' => $itemId,
+                    'itemId' => $currentId,
                     'ptItemId' => $ptItemId,
                     'totalNum' => $totalNum,
                     'totalPrice' => $totalPrice,
@@ -197,7 +195,7 @@ class OrderService extends BaseService
 
                 $groupItemData[] = [
                     'name' => $name,
-                    'itemId' => $itemId,
+                    'itemId' => $currentId,
                     'ptItemId' => $ptItemId,
                     'num' => $num,
                     'unitType' => $unitType,
@@ -222,8 +220,8 @@ class OrderService extends BaseService
 
         //保存组合
         $groupName = $data['groupName'] ?? '';
-        if (!empty($groupName)) {
-            $groupData = ['price' => $modifyPrice, 'name' => $groupName, 'sjId' => $sjId, 'shopId' => $shopId, 'cover' => $groupCover];
+        if (empty($groupId) && !empty($groupName)) {
+            $groupData = ['price' => $modifyPrice, 'mainId' => $mainId, 'name' => $groupName, 'sjId' => $sjId, 'shopId' => $shopId, 'cover' => $groupCover];
             $group = GroupClass::add($groupData, true);
             $groupId = $group->id ?? 0;
             if (!empty($groupGoodsData)) {
@@ -256,7 +254,6 @@ class OrderService extends BaseService
         //保存订单
         $returnOrder = OrderClass::addOrder($addData);
 
-
         //欠款和已付款的直接完成
         if (in_array($hasPay, [dict::getDict('hasPay', 'payed'), dict::getDict('hasPay', 'debt')])) {
             OrderClass::payAfter($returnOrder, $payWay);

biz-hd/purchase/classes/PurchaseClass.php

@@ -12,6 +12,7 @@ use bizGhs\admin\classes\AdminClass;
 use bizGhs\custom\classes\CustomClass;
 use bizGhs\order\traits\OrderTrait;
 use bizGhs\product\classes\ProductClass;
+use bizGhs\stock\classes\StockRecordClass;
 use bizGhs\stock\services\StockRecordService;
 use bizHd\cg\classes\CgXjClass;
 use common\components\dict;
@@ -573,7 +574,7 @@ class PurchaseClass extends BaseClass
             $recordData['newStock'] = $stockInfo['newStock'];
             $recordData['productId'] = $v['productId'];
             $recordData['orderSn'] = $orderSn;
-            StockRecordService::addPurchaseOrderRecord($recordData);
+            StockRecordClass::addPurchaseOrderRecord($recordData);
         }
     }
 

console/controllers/InitController.php

@@ -98,9 +98,10 @@ class InitController extends Controller
             StatCgGhsClass::updateByCondition(['shopId' => $shopId], ['mainId' => $mainId]);
             StatCgGhsMonthClass::updateByCondition(['shopId' => $shopId], ['mainId' => $mainId]);
 
+            /********琦海 start ************/
             //花材中央化
             ItemClass::updateByCondition(['shopId' => $shopId], ['mainId' => $mainId]);
-
+            /********琦海 end ************/
         }
 
         //零售
@@ -126,8 +127,11 @@ class InitController extends Controller
             GoodsClass::updateByCondition(['sjId' => $sjId], ['mainId' => $mainId]);
             GoodsCategoryClass::updateByCondition(['sjId' => $sjId], ['mainId' => $mainId]);
 
+
+            /********琦海 start ************/
             //花材中央化
             ItemClass::updateByCondition(['shopId' => $shopId], ['mainId' => $mainId]);
+            /********琦海 end ************/
 
         }
 

sql.txt

@@ -258,6 +258,7 @@ ALTER TABLE xhShop ADD `openEndTime` VARCHAR(30) NOT NULL DEFAULT '' COMMENT '
 DROP TABLE IF EXISTS `xhGroup`;
 CREATE TABLE IF NOT EXISTS `xhGroup`(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+`mainId` int not null default 0 comment '中央id',
 `sjId` int not null default 0 comment '商家id',
 `shopId` int not null default 0 comment '门店id',
 `name` VARCHAR(80) NOT NULL DEFAULT '' COMMENT '组合名称',
@@ -379,8 +380,8 @@ CREATE TABLE `xhOrderItem` (
   `orderSn` CHAR(20) NOT NULL DEFAULT '' COMMENT '订单编号',
   `itemId` INT(11) NOT NULL DEFAULT '0' COMMENT '商家花材id',
   `ptItemId` INT NOT NULL DEFAULT 0 COMMENT '平台花材id',
-  `totalNum` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '数量',
-  `totalPrice` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '总价',
+  `count` DECIMAL(10,2) NOT NULL DEFAULT '0.00' COMMENT '数量，转换后带小数点的数量',
+  `price` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '总价',
   `customId` INT(11) NOT NULL DEFAULT '0' COMMENT '客户id',
   `hdId` INT NOT NULL DEFAULT 0 COMMENT '花店id',
   `sjId` INT(11) NOT NULL DEFAULT '0' COMMENT '商户id',
@@ -404,7 +405,7 @@ CREATE TABLE `xhOrderGoods` (
   `cover` VARCHAR(200) NOT NULL DEFAULT '' COMMENT '封面',
   `unitPrice` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '单价',
   `num` INT(11) NOT NULL DEFAULT '0' COMMENT '数量',
-  `totalPrice` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '总价',
+  `price` DECIMAL(9,2) NOT NULL DEFAULT '0.00' COMMENT '总价',
   `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间',
   `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
   PRIMARY KEY (`id`)
@@ -423,3 +424,10 @@ ALTER TABLE xhStatIncomeMonth ADD INDEX idx_mainId(`mainId`,`time`);
 
 UPDATE xhGoods SET stock=0 WHERE stock=-100000;
 ALTER TABLE xhGhsStockRecord MODIFY `itemId` INT(11) UNSIGNED NOT NULL DEFAULT '0' COMMENT '平台花材ID';
+
+ALTER TABLE xhStatOrder DROP INDEX `shop`;
+ALTER TABLE xhStatOrder ADD INDEX `mainId`(`mainId`,`time`);
+ALTER TABLE xhStatOrderCount DROP INDEX `shop`;
+ALTER TABLE xhStatOrderCount ADD INDEX `mainId`(`mainId`,`time`);
+ALTER TABLE xhStatOrderMonth DROP INDEX `shop`;
+ALTER TABLE xhStatOrderMonth ADD INDEX `mainId`(`mainId`,`time`);