支出

app-ghs/controllers/CheckOrderController.php

@@ -24,7 +24,7 @@ class CheckOrderController extends BaseController
         util::success($list);
     }
 
-    //订单详情 2021.1.22 linqh
+    //订单详情 2021.1.22 lqh
     public function actionDetail()
     {
         $orderSn = Yii::$app->request->get('orderSn', '');
@@ -32,7 +32,7 @@ class CheckOrderController extends BaseController
         util::success($orderData);
     }
 
-    //盘点确认 linqh 2021.1.22
+    //盘点确认 lqh 2021.1.22
     public function actionCreateOrder()
     {
         $shopAdmin = $this->shopAdmin;
@@ -49,7 +49,7 @@ class CheckOrderController extends BaseController
 
     }
 
-    //盘点存草稿 linqh 2021.1.22
+    //盘点存草稿 lqh 2021.1.22
     public function actionCreateDraft()
     {
         $shopAdmin = $this->shopAdmin;

app-ghs/controllers/ConsoleController.php

@@ -38,7 +38,7 @@ class ConsoleController extends BaseController
         $todaySale = $sale['amount'] ?? 0;
         $orderNum = $sale['num'] ?? 0;
 
-        //2021.4.14 linqh 今日支出
+        //2021.4.14 lqh 今日支出
         $outData = StatOutService::getTodayNum($this->mainId);
         $todayOut = $outData['amount'] ?? '0.00';
 

app-ghs/controllers/ProductController.php

@@ -531,7 +531,7 @@ class ProductController extends BaseController
             }
             $currentProduct->save();
 
-            //2021.7.6 linqh 如果是首店，则更新全部分店
+            //2021.7.6 lqh 如果是首店，则更新全部分店
             ProductClass::updateSyncProduct($id, $this->shopId, $data);
 
         }
@@ -713,7 +713,7 @@ class ProductController extends BaseController
         util::success(['file' => $fileUrl, 'shortFile' => $shortFile]);
     }
 
-    //下载条形码 linqh 20211227
+    //下载条形码 lqh 20211227
     public function actionGenerateBarcodeTable()
     {
         $respond = ProductService::generateBarcodeTable($this->sjId, $this->shopId,$this->mainId);

app-ghs/controllers/RefundController.php

@@ -37,7 +37,7 @@ class RefundController extends BaseController
         util::success(['info' => $refund, 'itemList' => $itemList]);
     }
 
-    //退款  linqh 2021.6.25
+    //退款  lqh 2021.6.25
     public function actionCreateOrder()
     {
 

app-ghs/controllers/ShopController.php

@@ -194,14 +194,14 @@ class ShopController extends BaseController
         util::complete();
     }
 
-    //获取所有门店linqh 2021.1.31
+    //获取所有门店lqh 2021.1.31
     public function actionAll()
     {
         $res = ShopClass::getAllShop($this->sjId);
         util::success($res);
     }
 
-    //切换门店 linqh 2021.1.31
+    //切换门店 lqh 2021.1.31
     public function actionToggleShop()
     {
         $shopId = Yii::$app->request->post('shopId', 0);

app-ghs/controllers/StockController.php

@@ -8,11 +8,11 @@ use common\components\dateUtil;
 use common\components\util;
 use Yii;
 
-//库存管理与预警 linqh 2021.1.26
+//库存管理与预警 lqh 2021.1.26
 class StockController extends BaseController
 {
 
-    //库存明细 linqh 2021.1.26
+    //库存明细 lqh 2021.1.26
     public function actionDetail()
     {
         $get = Yii::$app->request->get();

app-ghs/controllers/StockInController.php

@@ -7,11 +7,11 @@ use bizGhs\order\classes\StockInOrderClass;
 use common\components\util;
 use Yii;
 
-//入库 linqh 2021.1.25
+//入库 lqh 2021.1.25
 class StockInController extends BaseController
 {
 
-    //入库列表 linqh 2021.1.25
+    //入库列表 lqh 2021.1.25
     public function actionList()
     {
         $get = Yii::$app->request->get();
@@ -25,7 +25,7 @@ class StockInController extends BaseController
         util::success($list);
     }
 
-    //入库详情 linqh 2021.1.25
+    //入库详情 lqh 2021.1.25
     public function actionDetail()
     {
         $orderSn = Yii::$app->request->get('orderSn', '');
@@ -33,7 +33,7 @@ class StockInController extends BaseController
         util::success($orderData);
     }
 
-    //确认入库 linqh 2021.1.24
+    //确认入库 lqh 2021.1.24
     public function actionConfirmOrder()
     {
         $get = Yii::$app->request->get();
@@ -42,7 +42,7 @@ class StockInController extends BaseController
         util::complete("出库成功");
     }
 
-    //取消入库  linqh 2021.1.24
+    //取消入库  lqh 2021.1.24
     public function actionCancelOrder()
     {
         $get = Yii::$app->request->get();

app-ghs/controllers/StockOutController.php

@@ -9,11 +9,11 @@ use bizGhs\product\classes\ProductClass;
 use common\components\util;
 use Yii;
 
-//出库 linqh 2021.1.23
+//出库 lqh 2021.1.23
 class StockOutController extends BaseController
 {
 
-    //出库列表 linqh 2021.1.23
+    //出库列表 lqh 2021.1.23
     public function actionList()
     {
         $get = Yii::$app->request->get();
@@ -27,7 +27,7 @@ class StockOutController extends BaseController
         util::success($list);
     }
 
-    //新增出库 linqh 2021.1.23
+    //新增出库 lqh 2021.1.23
     public function actionCreateOrder()
     {
 
@@ -83,7 +83,7 @@ class StockOutController extends BaseController
         }
     }
 
-    //出库详情 linqh 2021.1.23
+    //出库详情 lqh 2021.1.23
     public function actionDetail()
     {
         $orderSn = Yii::$app->request->get('orderSn', '');
@@ -91,7 +91,7 @@ class StockOutController extends BaseController
         util::success($orderData);
     }
 
-    //确认出库 linqh 2021.1.23
+    //确认出库 lqh 2021.1.23
     public function actionConfirmOrder()
     {
         $get = Yii::$app->request->get();
@@ -101,7 +101,7 @@ class StockOutController extends BaseController
     }
 
 
-    //取消出库 linqh 2021.1.23
+    //取消出库 lqh 2021.1.23
     public function actionCancelOrder()
     {
         $get = Yii::$app->request->get();

app-ghs/controllers/UploadController.php

@@ -203,7 +203,7 @@ class UploadController extends BaseController
                 $fullPathFile = $newFullPathFile;
             }
 
-            //上传oss  2021.3.18 linqh
+            //上传oss  2021.3.18 lqh
             oss::uploadImage($img, $fullPathFile);
 
             //生成小图 200px

app-hd/controllers/CheckOrderController.php

@@ -24,7 +24,7 @@ class CheckOrderController extends BaseController
         util::success($list);
     }
 
-    //订单详情 2021.1.22 linqh
+    //订单详情 2021.1.22 lqh
     public function actionDetail()
     {
         $orderSn = Yii::$app->request->get('orderSn', '');
@@ -32,7 +32,7 @@ class CheckOrderController extends BaseController
         util::success($orderData);
     }
 
-    //盘点确认 linqh 2021.1.22
+    //盘点确认 lqh 2021.1.22
     public function actionCreateOrder()
     {
         $post = Yii::$app->request->post();
@@ -45,7 +45,7 @@ class CheckOrderController extends BaseController
 
     }
 
-    //盘点存草稿 linqh 2021.1.22
+    //盘点存草稿 lqh 2021.1.22
     public function actionCreateDraft()
     {
         $post = Yii::$app->request->post();

app-hd/controllers/ConsoleController.php

@@ -4,6 +4,7 @@ namespace hd\controllers;
 
 use biz\sj\classes\SjClass;
 use biz\sj\services\MerchantAssetService;
+use biz\stat\services\StatOutService;
 use bizHd\stat\classes\StatStudentClass;
 use bizHd\stat\services\StatIncomeMonthService;
 use bizHd\stat\services\StatIncomeService;
@@ -70,7 +71,12 @@ class ConsoleController extends BaseController
             $todayIncome = 0.00;
             $todayOrder = 0;
         }
-        $todayData = ['visit' => $todayVisit, 'income' => $todayIncome, 'order' => $todayOrder, 'newStudent' => 0];
+
+        //2021.4.14 lqh 今日支出
+        $outData = StatOutService::getTodayNum($this->mainId);
+        $todayOut = $outData['amount'] ?? '0.00';
+
+        $todayData = ['visit' => $todayVisit, 'income' => $todayIncome, 'order' => $todayOrder, 'out' => $todayOut];
         $incomeStat = [];
         $visitStat = [
             'month' => 1999,

app-hd/controllers/OrderController.php

@@ -586,7 +586,7 @@ class OrderController extends BaseController
         util::success($data);
     }
 
-    //运费计算  linqh 2021.4.12  暂反回固定
+    //运费计算  lqh 2021.4.12  暂反回固定
     public function actionFreight()
     {
         util::success(['sedCost' => 10]);

app-hd/controllers/PurchaseController.php

@@ -282,10 +282,10 @@ class PurchaseController extends BaseController
         util::success($newParams);
     }
 
-    //运费计算  linqh 2021.4.12  暂时返回固定值
+    //运费计算  lqh 2021.4.12  暂时返回固定值
     public function actionFreight()
     {
-        //linqh 2021.6.25 运费固定返回0
+        //lqh 2021.6.25 运费固定返回0
         util::success(['sedCost' => 0]);
         $post = Yii::$app->request->post();
         $ghsId = $post['ghsId'] ?? 0;

app-hd/controllers/ShopController.php

@@ -77,7 +77,7 @@ class ShopController extends BaseController
         }
     }
 
-    //切换门店 linqh 2021.1.31
+    //切换门店 lqh 2021.1.31
     public function actionToggleShop()
     {
         $shopId = Yii::$app->request->post('shopId', 0);
@@ -231,7 +231,7 @@ class ShopController extends BaseController
         util::complete();
     }
 
-    //获取所有门店linqh 2021.1.31
+    //获取所有门店lqh 2021.1.31
     public function actionAll()
     {
         $res = [];

app-hd/controllers/StockController.php

@@ -10,7 +10,7 @@ use Yii;
 class StockController extends BaseController
 {
 
-    //库存明细 linqh 2021.1.26
+    //库存明细 lqh 2021.1.26
     public function actionDetail()
     {
         $get = Yii::$app->request->get();

app-hd/controllers/UploadController.php

@@ -102,7 +102,7 @@ class UploadController extends BaseController
                 $fullPathFile = $newFullPathFile;
             }
 
-            //上传oss  2021.3.18 linqh
+            //上传oss  2021.3.18 lqh
             oss::uploadImage($img, $fullPathFile);
 
             //生成小图 200px

app-pt/controllers/UploadController.php

@@ -58,7 +58,7 @@ class UploadController extends BaseController
 				$fullPathFile = $newFullPathFile;
 			}
 
-			//上传oss  2021.3.18 linqh
+			//上传oss  2021.3.18 lqh
 			oss::uploadImage($img,$fullPathFile);
 
 			//生成小图 200px

biz-ghs/admin/classes/AdminClass.php

@@ -407,7 +407,7 @@ class AdminClass extends BaseClass
         self::updateById($adminId, ['subscribe' => 0, 'hasSubscribe' => 1]);
     }
 
-    //切换门店 linqh 2021.1.31
+    //切换门店 lqh 2021.1.31
     public static function toggleShop($admin, $toggleShopId, $sjId, $originShopAdmin)
     {
         $right = \biz\shop\classes\ShopAdminClass::hasSwitchShopRight($originShopAdmin);

biz-ghs/express/services/MiniExpressService.php

@@ -2,7 +2,7 @@
 namespace bizGhs\express\services;
 
 
-//小程序 即使配送相关接口 linqh 2021.2.4
+//小程序 即使配送相关接口 lqh 2021.2.4
 use bizHd\wx\classes\WxOpenClass;
 use biz\express\classes\ExpressClass;
 use common\components\miniUtil;
@@ -413,7 +413,7 @@ class MiniExpressService
     //重新下单（暂不支持。可以先取消，再下单）
     //todo
 
-    //运力签名 linqh 2021.2.3
+    //运力签名 lqh 2021.2.3
     public static function getDeliverySign($shopId,$appSecret,$shopOrderId)
     {
         return sha1($shopId.$shopOrderId.$appSecret);

biz-ghs/item/classes/ItemClass.php

@@ -118,13 +118,13 @@ class ItemClass extends BaseClass
         return $data;
     }
 
-    //获取某个花材的信息 linqh 2021.1.28
+    //获取某个花材的信息 lqh 2021.1.28
     public static function getItemData($itemId, $sjId)
     {
         return self::getByCondition(['itemId' => $itemId, 'sjId' => $sjId]);
     }
 
-    //修改某个花材的成本价（采购之后要用到） linqh 2021.1.28 （废弃不用，更新product）
+    //修改某个花材的成本价（采购之后要用到） lqh 2021.1.28 （废弃不用，更新product）
     public static function changeCost($itemId, $sjId, $cost)
     {
         return self::updateByCondition(['itemId' => $itemId, 'sjId' => $sjId], ['cost' => $cost]);

biz-ghs/item/services/ItemService.php

@@ -112,7 +112,7 @@ class ItemService extends BaseService
         }
     }
 
-    //初始化 花材 ghsItemClass, ghsItem  ghsProduct  linqh 2021.4.12  modify ssh 20210711
+    //初始化 花材 ghsItemClass, ghsItem  ghsProduct  lqh 2021.4.12  modify ssh 20210711
     public static function initItem($sjId, $shopId)
     {
         $shop = ShopClass::getById($shopId, true);

biz-ghs/merchant/classes/ShopClass.php

@@ -62,11 +62,11 @@ class ShopClass extends BaseClass
         if (!empty($exists)) {
             util::fail('门店名称已经存在');
         }
-        //补充fullAddress linqh 2021.4.18
+        //补充fullAddress lqh 2021.4.18
         $data['fullAddress'] = $data['city'] . $data['address'] . $data['floor'];
         $shop = self::add($data);
         $newShopId = $shop['id'];
-        //初始化花材 linqh 2021.5.11
+        //初始化花材 lqh 2021.5.11
         $adminId = $data['adminId'] ?? 0;
         $shopId = $data['shopId'] ?? 0;
         ProductClass::newShopInitProduct($data['sjId'], $shopId, $newShopId, $adminId);

biz-ghs/order/classes/CheckOrderClass.php

@@ -28,7 +28,7 @@ class CheckOrderClass extends BaseClass
         self::STATUS_COMPLETE => '已盘点',
     ];
 
-    //2021.1.22 linqh 操作订单  添加/保存草稿/草稿编辑保存： 区别在添加是立即改库存和记录流水记录，而保存草稿是只保存订单信息
+    //2021.1.22 lqh 操作订单  添加/保存草稿/草稿编辑保存： 区别在添加是立即改库存和记录流水记录，而保存草稿是只保存订单信息
     public static function opOrder($data, $draft = false, $update = false)
     {
         $sjId = $data['sjId'];
@@ -140,7 +140,7 @@ class CheckOrderClass extends BaseClass
 
     }
 
-    //2021.1.22 linqh 订单列表
+    //2021.1.22 lqh 订单列表
     public static function getOrderList($where)
     {
         $data = self::getList('*', $where, 'addTime DESC');
@@ -188,7 +188,7 @@ class CheckOrderClass extends BaseClass
         return $orderData;
     }
 
-    //2021.1.22 linqh 判断订单号是否存在
+    //2021.1.22 lqh 判断订单号是否存在
     public static function orderExist($orderSn, $shopId)
     {
         $where = [
@@ -202,7 +202,7 @@ class CheckOrderClass extends BaseClass
         return $orderData;
     }
 
-    // 组装 orderItem  linqh 2021.1.25
+    // 组装 orderItem  lqh 2021.1.25
     public static function groupOrderItem($ghsItemInfo, $orderSn)
     {
         $productData = self::getProductMapData($ghsItemInfo);
@@ -245,7 +245,7 @@ class CheckOrderClass extends BaseClass
         return $batchData;
     }
 
-    // 组装状态码 linqh 2021.1.30
+    // 组装状态码 lqh 2021.1.30
     public static function groupStatusName($list)
     {
         foreach ($list as $k => $val) {

biz-ghs/order/classes/OrderClass.php

@@ -1202,7 +1202,7 @@ class OrderClass extends BaseClass
         return $order;
     }
 
-    //修改订单表的配送信息 linqh 2021.3.28
+    //修改订单表的配送信息 lqh 2021.3.28
     public static function updateCustomExpressInfo($id, $expressAddInfo)
     {
         $data = [

biz-ghs/order/classes/OrderExpressClass.php

@@ -44,7 +44,7 @@ class OrderExpressClass extends BaseClass
         if (empty($info)) {
             return [];
         }
-        //m => km  linqh 2021.6.4
+        //m => km  lqh 2021.6.4
         $info['distance'] = round($info['distance']/1000,2);
         return $info;
     }

biz-ghs/order/classes/PurchaseOrderClass.php

@@ -387,7 +387,7 @@ class PurchaseOrderClass extends BaseClass
         return $orderData;
     }
 
-    // 组装 orderItem  linqh 2021.1.25
+    // 组装 orderItem  lqh 2021.1.25
     public static function groupOrderItem($ghsItemInfo, $orderSn)
     {
         $productData = self::getProductMapData($ghsItemInfo);
@@ -408,7 +408,7 @@ class PurchaseOrderClass extends BaseClass
         return $batchData;
     }
 
-    // 组装状态码 linqh 2021.1.30
+    // 组装状态码 lqh 2021.1.30
     public static function groupStatusName($list)
     {
         foreach ($list as $k => $val) {

biz-ghs/order/classes/RefundOrderClass.php

@@ -50,7 +50,7 @@ class RefundOrderClass extends BaseClass
     }
 
 
-    //2021.1.23 linqh 订单详情
+    //2021.1.23 lqh 订单详情
     public static function getOrderDetail($orderSn, $shopId)
     {
         $orderData = self::orderExist(['orderSn' => $orderSn, 'shopId' => $shopId]);
@@ -76,7 +76,7 @@ class RefundOrderClass extends BaseClass
         return $orderData;
     }
 
-    //2021.1.23 linqh 判断定时是否存在
+    //2021.1.23 lqh 判断定时是否存在
     public static function orderExist($where)
     {
         $orderData = self::getByCondition($where);
@@ -86,7 +86,7 @@ class RefundOrderClass extends BaseClass
         return $orderData;
     }
 
-    // 组装 orderItem  linqh 2021.1.25
+    // 组装 orderItem  lqh 2021.1.25
     public static function groupOrderItem($ghsItemInfo, $refundOrderSn, $preOrderItem)
     {
         $productIds = array_column($ghsItemInfo, 'productId');
@@ -137,7 +137,7 @@ class RefundOrderClass extends BaseClass
         return $batchData;
     }
 
-    //2021.1.23 linqh 订单详情
+    //2021.1.23 lqh 订单详情
     public static function getOrderDetailByRelateOrder($orderSn, $shopId)
     {
         $orderData = self::orderExist(['relateOrderSn' => $orderSn, 'shopId' => $shopId]);

biz-ghs/order/classes/StockInOrderClass.php

@@ -32,7 +32,7 @@ class StockInOrderClass extends BaseClass
         self::STATUS_COMPLETE => '已入库',
     ];
 
-    //2021.1.25 linqh 订单列表
+    //2021.1.25 lqh 订单列表
     public static function getOrderList($where)
     {
         $data = self::getList('*', $where, 'addTime DESC');
@@ -56,7 +56,7 @@ class StockInOrderClass extends BaseClass
     }
 
 
-    //入库 (状态在待入库中 )linqh  2021.1.23
+    //入库 (状态在待入库中 )lqh  2021.1.23
     public static function addOrder($outOrderData)
     {
         $data = [];
@@ -260,7 +260,7 @@ class StockInOrderClass extends BaseClass
     }
 
 
-    //2021.1.23 linqh 订单详情
+    //2021.1.23 lqh 订单详情
     public static function getOrderDetail($orderSn, $shopId)
     {
         $orderData = self::orderExist(['orderSn' => $orderSn, 'inShopId' => $shopId]);
@@ -289,7 +289,7 @@ class StockInOrderClass extends BaseClass
         return $orderData;
     }
 
-    //2021.1.25 linqh 判断定时是否存在
+    //2021.1.25 lqh 判断定时是否存在
     public static function orderExist($where)
     {
         $orderData = self::getByCondition($where);
@@ -299,7 +299,7 @@ class StockInOrderClass extends BaseClass
         return $orderData;
     }
 
-    // 组装状态码 linqh 2021.1.30
+    // 组装状态码 lqh 2021.1.30
     public static function groupStatusName($list)
     {
         foreach ($list as $k => $val) {

biz-ghs/order/classes/StockOutOrderClass.php

@@ -31,7 +31,7 @@ class StockOutOrderClass extends BaseClass
 
     public static $baseFile = '\bizGhs\order\models\StockOutOrder';
 
-    //2021.1.23 linqh 新增出库订单
+    //2021.1.23 lqh 新增出库订单
     public static function addOrder($data)
     {
         $action = $data['action'];
@@ -84,7 +84,7 @@ class StockOutOrderClass extends BaseClass
     }
 
 
-    //2021.1.23 linqh  确认出库 :
+    //2021.1.23 lqh  确认出库 :
     // 一、从状态 1 修改为 2
     // 二、解除解冻的库存 todo
     // 三、增加流水记录
@@ -130,7 +130,7 @@ class StockOutOrderClass extends BaseClass
 
     }
 
-    //2021.1.23. linqh 取消出库 ：
+    //2021.1.23. lqh 取消出库 ：
     //一、 从状态1 修改为 3
     //二、 加回库存
     public static function cancelOrder($orderSn, $shopId, $adminId)
@@ -165,7 +165,7 @@ class StockOutOrderClass extends BaseClass
 
     }
 
-    //2021.1.23 linqh 订单列表
+    //2021.1.23 lqh 订单列表
     public static function getOrderList($where)
     {
         $data = self::getList('*', $where, 'addTime DESC');
@@ -187,7 +187,7 @@ class StockOutOrderClass extends BaseClass
         return $data;
     }
 
-    //2021.1.23 linqh 订单详情
+    //2021.1.23 lqh 订单详情
     public static function getOrderDetail($orderSn, $shopId)
     {
         $orderData = self::orderExist(['orderSn' => $orderSn, 'outShopId' => $shopId]);
@@ -216,7 +216,7 @@ class StockOutOrderClass extends BaseClass
         return $orderData;
     }
 
-    //2021.1.23 linqh 判断定时是否存在
+    //2021.1.23 lqh 判断定时是否存在
     public static function orderExist($where)
     {
         $orderData = self::getByCondition($where);
@@ -226,7 +226,7 @@ class StockOutOrderClass extends BaseClass
         return $orderData;
     }
 
-    // 组装 orderItem  linqh 2021.1.25
+    // 组装 orderItem  lqh 2021.1.25
     public static function groupOrderItem($ghsItemInfo, $orderSn)
     {
         $productData = self::getProductMapData($ghsItemInfo);
@@ -265,7 +265,7 @@ class StockOutOrderClass extends BaseClass
         return $batchData;
     }
 
-    // 组装状态码 linqh 2021.1.30
+    // 组装状态码 lqh 2021.1.30
     public static function groupStatusName($list)
     {
         foreach ($list as $k => $val) {

biz-ghs/order/classes/StockWastageOrderClass.php

@@ -95,7 +95,7 @@ class StockWastageOrderClass extends BaseClass
 
     }
 
-    //2021.1.23 linqh 订单详情
+    //2021.1.23 lqh 订单详情
     public static function getOrderDetail($orderSn, $mainId)
     {
         $orderData = self::orderExist(['orderSn' => $orderSn, 'mainId' => $mainId]);
@@ -119,7 +119,7 @@ class StockWastageOrderClass extends BaseClass
         return $orderData;
     }
 
-    //2021.1.23 linqh 判断定时是否存在
+    //2021.1.23 lqh 判断定时是否存在
     public static function orderExist($where)
     {
         $orderData = self::getByCondition($where);
@@ -130,7 +130,7 @@ class StockWastageOrderClass extends BaseClass
     }
 
 
-    // 组装 orderItem  linqh 2021.1.25
+    // 组装 orderItem  lqh 2021.1.25
     public static function groupOrderItem($ghsItemInfo, $orderSn)
     {
         $productData = self::getProductMapData($ghsItemInfo);

biz-ghs/order/models/StockInSn.php

@@ -4,7 +4,7 @@ namespace bizGhs\order\models;
 
 use bizGhs\base\models\Base;
 
-//入库单号 linqh 2021.1.23
+//入库单号 lqh 2021.1.23
 class StockInSn extends Base
 {
 

biz-ghs/order/models/StockOutSn.php

@@ -4,7 +4,7 @@ namespace bizGhs\order\models;
 
 use bizGhs\base\models\Base;
 
-//出库单号 linqh 2021.1.23
+//出库单号 lqh 2021.1.23
 class StockOutSn extends Base
 {
 

biz-ghs/order/traits/OrderTrait.php

@@ -31,7 +31,7 @@ trait OrderTrait
         return $list;
     }
 
-    //2021.1.22 linqh 一维数组拼装admin信息
+    //2021.1.22 lqh 一维数组拼装admin信息
     public static function groupAdmin($data)
     {
         $adminId = $data['adminId'] ?? 0;
@@ -63,7 +63,7 @@ trait OrderTrait
         return $list;
     }
 
-    //通过itemInfo 获取商品ID 对应数据（库存） linqh 2021.1.23
+    //通过itemInfo 获取商品ID 对应数据（库存） lqh 2021.1.23
     public static function getProductMapData($itemInfo, $key = 'productId')
     {
         $productIds = array_column($itemInfo, $key);
@@ -72,7 +72,7 @@ trait OrderTrait
         return $productData;
     }
 
-    //通过itemInfo  求和大、小单位数  linqh 2021.1.25
+    //通过itemInfo  求和大、小单位数  lqh 2021.1.25
     public static function sumNumByItemInfo($itemInfo)
     {
         $bigNum = 0; //总共多少扎

biz-ghs/product/classes/ProductClass.php

@@ -353,12 +353,12 @@ class ProductClass extends BaseClass
             util::fail("{$currentName} 只剩{$currentRemainStock}扎，请修改");
         }
         self::updateStockById($productId, $newStock);
-        //减库存，加销量 2021.6.21 linqh
+        //减库存，加销量 2021.6.21 lqh
         $actualSold = $productData->actualSold;
         $newActualSold = bcadd($actualSold, $itemNum, 2);
         self::updateActualSoldById($productId, $newActualSold);
 
-        //库存=0 下架商品 linqh 2021.7.9
+        //库存=0 下架商品 lqh 2021.7.9
         if ($newStock <= 0) {
             self::changeStatus($productId, 2);
         }
@@ -395,7 +395,7 @@ class ProductClass extends BaseClass
         }
         self::updateStockById($productId, $newStock);
 
-        //减库存，加销量 2021.6.21 linqh
+        //减库存，加销量 2021.6.21 lqh
         $actualSold = $productData['actualSold'];
         $newActualSold = bcadd($actualSold, $itemNum, 2);
         self::updateActualSoldById($productId, $newActualSold);
@@ -457,7 +457,7 @@ class ProductClass extends BaseClass
         return $data;
     }
 
-    //根据多个itemIds shopId 获取对应的 productId  linqh 2021.1.24
+    //根据多个itemIds shopId 获取对应的 productId  lqh 2021.1.24
     public static function getGhsProductDataByItemIds($shopId, $itemIds)
     {
         $where = ['itemId' => ['in', $itemIds], 'shopId' => $shopId];
@@ -465,7 +465,7 @@ class ProductClass extends BaseClass
         return $data;
     }
 
-    //补全itemId (针对入库时 当前门店下无对应的花材 itemId)  linqh 2021.1.24
+    //补全itemId (针对入库时 当前门店下无对应的花材 itemId)  lqh 2021.1.24
     public static function complementProduct($sjId, $shopId, $itemInfo)
     {
         $itemIds = array_column($itemInfo, "itemId");
@@ -545,13 +545,13 @@ class ProductClass extends BaseClass
         }
     }
 
-    //获取当前门店下商品信息 linqh 2021.1.28
+    //获取当前门店下商品信息 lqh 2021.1.28
     public static function getProductData($id, $shopId, $obj = false)
     {
         return ProductClass::getByCondition(['id' => $id, 'shopId' => $shopId], $obj);
     }
 
-    //修改价格 linqh 2021.1.28
+    //修改价格 lqh 2021.1.28
     public static function changePrice($product, $price, $priceLabel)
     {
         $shopId = $product->shopId ?? 0;
@@ -624,7 +624,7 @@ class ProductClass extends BaseClass
         }
     }
 
-    //下单时计算商品的价格  linqh 2021.1.28
+    //下单时计算商品的价格  lqh 2021.1.28
     public static function formatProductInfo($itemInfo, $level = 0)
     {
         $data = [];
@@ -735,7 +735,7 @@ class ProductClass extends BaseClass
         return ['product' => $data, 'smallNum' => $totalSmallNum, 'bigNum' => $totalBigNum, 'price' => $totalPrice, 'totalItemNum' => $totalItemNum];
     }
 
-    //  //修改某个花材的成本价（采购之后要用到） linqh 2021.04.06
+    //  //修改某个花材的成本价（采购之后要用到） lqh 2021.04.06
     public static function changeCost($productId, $cost)
     {
         return self::updateById($productId, ['cost' => $cost]);
@@ -926,7 +926,7 @@ class ProductClass extends BaseClass
         unset($currentData['price']);
         self::updateById($id, $currentData);
 
-        //2021.7.6 linqh 如果是首店，则更新全部分店
+        //2021.7.6 lqh 如果是首店，则更新全部分店
         self::updateSyncProduct($id, $product->shopId, $upData);
     }
 
@@ -951,7 +951,7 @@ class ProductClass extends BaseClass
         return self::getAllByCondition($where, null, $field);
     }
 
-    //获取当前门店下所有花材的库存数量,及成本价,库存预警的花材数量  linqh 2021-04-20
+    //获取当前门店下所有花材的库存数量,及成本价,库存预警的花材数量  lqh 2021-04-20
     public static function getProductStockByShopId($sjId, $shopId)
     {
         $productInfo = self::getAllProduct($sjId, $shopId, "*");
@@ -1186,7 +1186,7 @@ class ProductClass extends BaseClass
 
                 $res = self::add($data);
                 if ($stock > 0 && $res && $currentShopId == $shopId) {
-                    //有库存数量，增加盘盈记录 2021.7.9 linqh
+                    //有库存数量，增加盘盈记录 2021.7.9 lqh
                     //增加盘点订单
                     $pdOrderSn = orderSn::getGhsCheckSn();
                     $pdOrderData = [];
@@ -1343,7 +1343,7 @@ class ProductClass extends BaseClass
         }
     }
 
-    //通过花材ID 获取mainId  linqh 2022.03.20
+    //通过花材ID 获取mainId  lqh 2022.03.20
     public static function getMainIdByProductId($productId)
     {
         $product = self::getById($productId, false);

biz-ghs/product/services/ProductService.php

@@ -57,7 +57,7 @@ class ProductService extends BaseService
                     if ($itemInfoData) {
                         foreach ($itemInfoData as $v) {
                             if (in_array($v['itemId'], $items)) {
-                                //冗余给前端使用 2021.1.31 linqh
+                                //冗余给前端使用 2021.1.31 lqh
                                 $v['classId'] = $classId;
                                 $v['className'] = $className;
                                 $tmp['child'][] = $v;
@@ -242,7 +242,7 @@ class ProductService extends BaseService
         return ['file' => '/priceTable/' . $sjId . '/' . $file, 'shortFile' => $file];
     }
 
-    //生成条形码 linqh 20211227
+    //生成条形码 lqh 20211227
     public static function generateBarcodeTable($sjId, $shopId,$mainId=0)
     {
         //中央ID

biz-ghs/stock/classes/StockRecordClass.php

@@ -195,14 +195,14 @@ class StockRecordClass extends BaseClass
         return self::addRecord($data);
     }
 
-    //制作成品消耗 linqh 2022.03.20
+    //制作成品消耗 lqh 2022.03.20
     public static function makeGoodsConsume($data)
     {
         $data['recordType'] = self::STOCK_RECORD_TYPE_GOODS_CONSUME;
         return self::addRecord($data);
     }
 
-    //制作成品损耗 linqh 2022.03.20
+    //制作成品损耗 lqh 2022.03.20
     public static function makeGoodsWastage($data)
     {
         $data['recordType'] = self::STOCK_RECORD_TYPE_GOODS_WASTAGE;

biz-hd/cg/classes/CgRefundClass.php

@@ -38,7 +38,7 @@ class CgRefundClass extends BaseClass
         return $data;
     }
 
-    //2021.1.23 linqh 订单详情
+    //2021.1.23 lqh 订单详情
     public static function getOrderDetail($orderSn, $shopId)
     {
         $orderData = self::orderExist(['orderSn' => $orderSn, 'shopId' => $shopId]);
@@ -65,7 +65,7 @@ class CgRefundClass extends BaseClass
     }
 
 
-    //2021.1.23 linqh 判断定时是否存在
+    //2021.1.23 lqh 判断定时是否存在
     public static function orderExist($where)
     {
         $orderData = self::getByCondition($where);
@@ -76,7 +76,7 @@ class CgRefundClass extends BaseClass
     }
 
 
-    // 组装 orderItem  linqh 2021.1.25
+    // 组装 orderItem  lqh 2021.1.25
     public static function groupOrderItem($ghsItemInfo, $orderSn, $cgItemList)
     {
         $productData = self::getProductMapData($ghsItemInfo);

biz-hd/goods/services/GoodsCategoryService.php

@@ -115,7 +115,7 @@ class GoodsCategoryService extends BaseService
         return $data;
     }
 
-	//获取常用分类的 goods id  linqh 2021.04.09
+	//获取常用分类的 goods id  lqh 2021.04.09
     public static function getOftenIds($mainId)
     {
         $data = GoodsClass::getLimitList("id", ['mainId' => $mainId], 10,'actualSold desc');
@@ -169,7 +169,7 @@ class GoodsCategoryService extends BaseService
                     if($goodsData){
                         foreach ($goodsData as $v){
                             if(in_array($v['id'],$items)){
-                                $v['classId'] = $classId; //前端要求增加classId 2021.1.31 linqh
+                                $v['classId'] = $classId; //前端要求增加classId 2021.1.31 lqh
                                 $tmp['child'][] = $v;
                             }
                         }

biz-hd/item/classes/ItemClass.php

@@ -92,13 +92,13 @@ class ItemClass extends BaseClass
         return $data;
     }
 
-    //获取某个花材的信息 linqh 2021.1.28
+    //获取某个花材的信息 lqh 2021.1.28
     public static function getItemData($itemId,$sjId)
     {
         return self::getByCondition(['itemId'=>$itemId,'sjId'=>$sjId]);
     }
 
-    //修改某个花材的成本价（采购之后要用到） linqh 2021.1.28
+    //修改某个花材的成本价（采购之后要用到） lqh 2021.1.28
     public static function changeCost($itemId,$sjId,$cost)
     {
         return self::updateByCondition(['itemId'=>$itemId,'sjId'=>$sjId],['cost'=>$cost]);

biz-hd/merchant/classes/ShopClass.php

@@ -49,7 +49,7 @@ class ShopClass extends BaseClass
         $data['img'] = isset($data['img']) ? json_encode($data['img']) : json_encode([]);
         $shop = self::add($data);
         $newShopId = $shop['id'];
-        //初始化花材 linqh 2021.5.11
+        //初始化花材 lqh 2021.5.11
         $adminId = $data['adminId'] ?? 0;
         $shopId = $data['shopId'] ?? 0;
         ProductClass::newShopInitProduct($data['sjId'], $shopId, $newShopId, $adminId);

biz-hd/purchase/classes/PurchaseClass.php

@@ -830,7 +830,7 @@ class PurchaseClass extends BaseClass
         $shop->cgFinish += 1;
         $shop->save();
 
-        /********订单完成后加库存 linqh 2021-05-10*********/
+        /********订单完成后加库存 lqh 2021-05-10*********/
         $orderSn = $purchase->orderSn;
         $purchaseItem = PurchaseItemClass::getAllByCondition(['orderSn' => $orderSn], null, "*");
         foreach ($purchaseItem as $v) {

biz-hd/stat/classes/StatIncomeClass.php

@@ -13,7 +13,7 @@ class StatIncomeClass extends BaseClass
 
     public static $baseFile = '\bizHd\stat\models\StatIncome';
 
-    //更新当前商家的数据 linqh 2021.4.15
+    //更新当前商家的数据 lqh 2021.4.15
     // 收入更新，若无则新增
     public static function updateOrInsert($shop, $amount)
     {

biz/admin/classes/AdminClass.php

@@ -19,7 +19,7 @@ class AdminClass extends BaseClass
     const SUPER_YES = 1;
     const SUPER_NO = 0;
 
-    //linqh 2021.5.14  [id=>adminData]
+    //lqh 2021.5.14  [id=>adminData]
     public static function getAdminMap($adminIds)
     {
         $where = [];

biz/shop/classes/ShopClass.php

@@ -80,7 +80,7 @@ class ShopClass extends BaseClass
         if (!empty($exists)) {
             util::fail('门店名称已经存在');
         }
-        //补充fullAddress linqh 2021.4.18
+        //补充fullAddress lqh 2021.4.18
         $data['fullAddress'] = $data['city'] . $data['address'] . $data['floor'];
         $img = '';
         if (isset($data['img']) && !empty($data['img'])) {
@@ -98,7 +98,7 @@ class ShopClass extends BaseClass
         ];
         ShopExtClass::add($extData);
 
-        //初始化花材 linqh 2021.5.11
+        //初始化花材 lqh 2021.5.11
         $adminId = $data['adminId'] ?? 0;
         $shopId = $data['shopId'] ?? 0;
         ProductClass::newShopInitProduct($data['sjId'], $shopId, $newShopId, $adminId);

biz/shop/services/ShopService.php

@@ -79,7 +79,7 @@ class ShopService extends BaseService
 	}
 
 
-    //根据商家ID，获取所有门店 shopIds  linqh 2021.3.4
+    //根据商家ID，获取所有门店 shopIds  lqh 2021.3.4
     public static function getShopIds($sjId)
     {
         $shops = ShopClass::getAllShop($sjId);
@@ -90,7 +90,7 @@ class ShopService extends BaseService
         return $shopIds;
     }
 
-    //获取门店资产信息 linqh 2021.4.14
+    //获取门店资产信息 lqh 2021.4.14
     public static function getById($shopId, $returnObj = false)
     {
         return ShopClass::getById($shopId, $returnObj);

biz/stat/classes/StatOutClass.php

@@ -20,7 +20,7 @@ class StatOutClass extends BaseClass
         return StatOut::find()->where($where)->sum('amount');
     }
 
-    //更新当前商家的数据 linqh 2021.4.13
+    //更新当前商家的数据 lqh 2021.4.13
     // 当采购后台，将价格更新
     public static function updateOrInsert($shop, $amount)
     {

biz/stat/services/StatOutService.php

@@ -13,7 +13,7 @@ class StatOutService extends BaseService
 {
     public static $baseFile = '\biz\stat\classes\StatOutClass';
 
-    //取今天的数据 linqh 2021.4.14
+    //取今天的数据 lqh 2021.4.14
     public static function getTodayNum($id)
     {
         $today = date("Ymd");

common/components/arrayUtil.php

@@ -84,7 +84,7 @@ class arrayUtil
 		return isset($items[0][$child]) ? $items[0][$child] : [];
 	}
 
-	//2021.2.23 linqh  返回二维数组中某个单一列的值
+	//2021.2.23 lqh  返回二维数组中某个单一列的值
     /**
      * @param array $arr
      * @param string $col

common/components/fileUtil.php

@@ -49,7 +49,7 @@ class fileUtil
 				$fullPathFile = $newFullPathFile;
 			}
 
-            //上传oss  2021.3.18 linqh
+            //上传oss  2021.3.18 lqh
             oss::uploadImage($img,$fullPathFile);
 
 			//生成小图 300px

common/components/miniUtil.php

@@ -1755,7 +1755,7 @@ class miniUtil
         return $respond;
     }
 
-    //获取已支持的配送公司列表接口  linqh 2021.2.2
+    //获取已支持的配送公司列表接口  lqh 2021.2.2
     public static function getAllImmeDelivery($merchant, $ptStyle = 0)
     {
         $accessToken = self::getMiniProgramAccessToken($merchant, $ptStyle);
@@ -1768,7 +1768,7 @@ class miniUtil
 
 
 
-    //下配送单接口 linqh 2021.2.2
+    //下配送单接口 lqh 2021.2.2
     //场景：
     /*
      * 商家可调用本接口向配送公司请求下配送单，配送公司会返回这一单的配送单号、配送费、预计骑手接单时间等信息。
@@ -1808,7 +1808,7 @@ class miniUtil
         return $respond;
     }
 
-    //取消配送单接口 linqh 2021.2.3
+    //取消配送单接口 lqh 2021.2.3
     public static function cancelOrder($data, $merchant, $ptStyle = 0)
     {
         $accessToken = self::getMiniProgramAccessToken($merchant, $ptStyle);
@@ -1820,7 +1820,7 @@ class miniUtil
         return $respond;
     }
 
-    //拉取配送单信息 linqh 2021.2.3
+    //拉取配送单信息 lqh 2021.2.3
     public static function getOrder($data, $merchant, $ptStyle = 0)
     {
         $accessToken = self::getMiniProgramAccessToken($merchant, $ptStyle);

common/components/orderSn.php

@@ -111,7 +111,7 @@ class orderSn
         return $prefix . $id;
     }
 
-    //供应商入库订单号 linqh 2021.1.23
+    //供应商入库订单号 lqh 2021.1.23
     public static function getGhsStockInSn()
     {
         $prefix = 'RK_CS';
@@ -126,7 +126,7 @@ class orderSn
         return $prefix . $id;
     }
 
-    //供应商出库订单号 linqh 2021.1.23
+    //供应商出库订单号 lqh 2021.1.23
     public static function getGhsStockOutSn()
     {
         $prefix = 'CK_CS';
@@ -218,7 +218,7 @@ class orderSn
     }
 
 
-    //供应商报损订单号 linqh 2021.6.211
+    //供应商报损订单号 lqh 2021.6.211
     public static function getGhsStockWastageSn()
     {
         $prefix = 'WT_CS';
@@ -233,7 +233,7 @@ class orderSn
         return $prefix . $id;
     }
 
-    //供货商退款订单号 linqh 2021.6.26
+    //供货商退款订单号 lqh 2021.6.26
     public static function getGhsRefundSn()
     {
         $prefix = 'TK_CS';

console/controllers/ItemController.php

@@ -131,7 +131,7 @@ class ItemController extends Controller
         echo "done";
     }
 
-    //平台花材初始化导入  linqh 2021-05-08
+    //平台花材初始化导入  lqh 2021-05-08
     //命令： ./yii  item/init-pt-item
     public function actionInitPtItem($clear = false)
     {

sql.txt

@@ -352,7 +352,7 @@ ALTER TABLE xhGoods CHANGE `goodsName` `name` VARCHAR(100) NOT NULL DEFAULT '' C
 ============ 批发零售绑定关系 ssh 20220314
 
 
-========================花材相关表结构变更start=======linqh 20220315=================
+========================花材相关表结构变更start=======lqh 20220315=================
 ALTER TABLE `xhGhsItem`
 ADD COLUMN `mainId`  int(11) UNSIGNED NOT NULL DEFAULT 0 COMMENT '中央id' AFTER `shopId`,
 ADD INDEX `idx_mainId` (`mainId`) ;