shish 1 年之前
父節點
當前提交
71f953c4f7

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

@@ -70,7 +70,7 @@ class BaseController extends PublicController
             $this->mainId = $mainId;
             $main = MainClass::getById($mainId, true);
             if (empty($main)) {
-                util::fail('没有main信息,shopId:' . $this->shopId);
+                util::fail('没有main信息17,shopId:' . $this->shopId);
             }
             $this->main = $main;
             $shopExt = ShopExtClass::getByCondition(['shopId' => $currentShopId], true);

+ 3 - 3
app-hd/controllers/MtController.php

@@ -140,7 +140,7 @@ class MtController extends PublicController
             }
             $mainId = $shop->mainId ?? 0;
             if (empty($mainId)) {
-                noticeUtil::push("..美团添加商品,通知我们时出错了,没有main信息", '15280215347');
+                noticeUtil::push("..美团添加商品,通知我们时出错了,没有main信息24", '15280215347');
                 //return Json::encode(['data' => 'ok']);
                 Yii::$app->end();
             }
@@ -263,7 +263,7 @@ class MtController extends PublicController
         }
         $mainId = $shop->mainId ?? 0;
         if (empty($mainId)) {
-            noticeUtil::push("美团删除商品,通知我们时出错了,没有main信息", '15280215347');
+            noticeUtil::push("美团删除商品,通知我们时出错了,没有main信息25", '15280215347');
             return Json::encode(['data' => 'ok']);
         }
         $mtCategory = CategoryClass::getByCondition(['mainId' => $mainId, 'style' => 1], true);
@@ -318,7 +318,7 @@ class MtController extends PublicController
             }
             $mainId = $shop->mainId ?? 0;
             if (empty($mainId)) {
-                noticeUtil::push("美团修改商品,通知我们时出错了,没有main信息", '15280215347');
+                noticeUtil::push("美团修改商品,通知我们时出错了,没有main信息26", '15280215347');
                 return Json::encode(['data' => 'ok']);
             }
             $mtCategory = CategoryClass::getByCondition(['mainId' => $mainId, 'style' => 1], true);

+ 1 - 1
app-pt/controllers/CashController.php

@@ -58,7 +58,7 @@ class CashController extends BaseController
             $mainId = $shop->mainId ?? 0;
             $main = MainClass::getLockById($mainId);
             if (empty($main)) {
-                util::fail('没有main信息');
+                util::fail('没有main信息28');
             }
             $cashAmount = isset($cash->amount) ? floatval($cash->amount) : 0;
             if ($cashAmount <= 0) {

+ 1 - 1
biz-ghs/apply/services/ApplyService.php

@@ -42,7 +42,7 @@ class ApplyService extends BaseService
             $lsShop->save();
             $main = MainClass::getById($mainId, true);
             if (empty($main)) {
-                util::fail('没有main信息');
+                util::fail('没有main信息21');
             }
         }
         ApplyClass::updateById($applyId, ['status' => ApplyClass::STATUS_PASS, 'remark' => $remark]);

+ 2 - 2
biz-ghs/clear/classes/ClearClass.php

@@ -171,7 +171,7 @@ class ClearClass extends BaseClass
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息19');
         }
         //门店应收客户款减少
         $currentGathering = bcsub($main->mayGathering, $order->actPrice, 2);
@@ -211,7 +211,7 @@ class ClearClass extends BaseClass
         $customMainId = $customShop->mainId ?? 0;
         $customMain = MainClass::getLockById($customMainId);
         if (empty($customMain)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息20');
         }
         $currentMayPay = bcsub($customMain->mayPay, $order->actPrice, 2);
         $customMain->mayPay = $currentMayPay;

+ 3 - 3
biz-ghs/custom/classes/CustomClass.php

@@ -504,7 +504,7 @@ class CustomClass extends BaseClass
         $mainId = $order->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息8');
         }
         $debt = $main->debt ?? 0;
         $remain = bcadd($debt, $amount, 2);
@@ -561,7 +561,7 @@ class CustomClass extends BaseClass
         $mainId = $ghs->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息9');
         }
         $debt = $main->debt ?? 0;
         $remain = bcsub($debt, $amount, 2);
@@ -607,7 +607,7 @@ class CustomClass extends BaseClass
         $mainId = $order->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息10');
         }
         $debt = $main->debt ?? 0;
         $remain = bcsub($debt, $refundPrice, 2);

+ 3 - 3
biz-ghs/order/classes/OrderClass.php

@@ -560,7 +560,7 @@ class OrderClass extends BaseClass
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息4');
         }
         $main->unSendOrder -= 1;
         $main->finishOrder += 1;
@@ -725,7 +725,7 @@ class OrderClass extends BaseClass
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息5');
         }
 
         //花材
@@ -2218,7 +2218,7 @@ class OrderClass extends BaseClass
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息6');
         }
         $main->unPayOrder -= 1;
         $main->cancelOrder += 1;

+ 2 - 2
biz-ghs/order/classes/PurchaseOrderClass.php

@@ -724,7 +724,7 @@ class PurchaseOrderClass extends BaseClass
         $ghsMainId = $ghsShop->mainId ?? 0;
         $ghsMain = \bizGhs\shop\classes\MainClass::getLockById($ghsMainId);
         if (empty($ghsMain)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息22');
         }
         $currentMayGathering = bcadd($ghsMain->mayGathering, $currentPrice, 2);
         $ghsMain->mayGathering = $currentMayGathering;
@@ -1182,7 +1182,7 @@ class PurchaseOrderClass extends BaseClass
                 $ghsMainId = $ghsShop->mainId ?? 0;
                 $ghsMain = \bizGhs\shop\classes\MainClass::getLockById($ghsMainId);
                 if (empty($ghsMain)) {
-                    util::fail('没有main信息');
+                    util::fail('没有main信息23');
                 }
                 $currentMayGathering = bcadd($ghsMain->mayGathering, $currentPrice, 2);
                 $ghsMain->mayGathering = $currentMayGathering;

+ 1 - 1
biz-ghs/order/classes/RefundOrderClass.php

@@ -202,7 +202,7 @@ class RefundOrderClass extends BaseClass
         }
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息32');
         }
 
         //总支出增加

+ 2 - 2
biz-ghs/order/classes/StockInOrderClass.php

@@ -270,7 +270,7 @@ class StockInOrderClass extends BaseClass
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息34');
         }
         $outCurrentTotalIncome = bcadd($main->totalIncome, $totalCost, 2);
         $currentTotalStockOut = bcadd($main->totalStockOut, $totalCost, 2);
@@ -303,7 +303,7 @@ class StockInOrderClass extends BaseClass
         $inMainId = $inShop->mainId ?? 0;
         $inMain = MainClass::getLockById($inMainId);
         if (empty($inMain)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息35');
         }
         $inCurrentTotalExpend = bcadd($inMain->totalExpend, $totalCost, 2);
         $inMain->totalExpend = $inCurrentTotalExpend;

+ 1 - 1
biz-ghs/order/classes/StockWastageOrderClass.php

@@ -125,7 +125,7 @@ class StockWastageOrderClass extends BaseClass
 
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息2');
         }
 
         //计算成本和售价

+ 1 - 1
biz-ghs/order/services/OrderService.php

@@ -754,7 +754,7 @@ class OrderService extends BaseService
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息3');
         }
         $main->unPayOrder -= 1;
         //预订单的待发货订单增加

+ 1 - 1
biz-ghs/part/classes/PartClass.php

@@ -100,7 +100,7 @@ class PartClass extends BaseClass
         StockRecordClass::addRecordByOrder($stockData, StockRecordClass::STOCK_RECORD_TYPE_PART);
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息18');
         }
         $totalCost = 0;
         $totalNum = 0;

+ 1 - 1
biz-hd/cg/classes/CgRefundClass.php

@@ -75,7 +75,7 @@ class CgRefundClass extends BaseClass
         }
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息7');
         }
         if ($refundType == CgRefundClass::REFUND_TYPE_MONEY_GOOD) {
             $refundItemList = CgRefundItemClass::getAllByCondition(['orderSn' => $refundSn], null, '*', null, true);

+ 1 - 1
biz-hd/cg/services/CgRefundService.php

@@ -142,7 +142,7 @@ class CgRefundService extends BaseService
         }
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息30');
         }
 
         $data = [];

+ 3 - 3
biz-hd/custom/classes/CustomClass.php

@@ -53,7 +53,7 @@ class CustomClass extends BaseClass
         $mainId = $order->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息38');
         }
         $debt = $main->debt ?? 0;
         $remain = bcadd($debt, $amount, 2);
@@ -102,7 +102,7 @@ class CustomClass extends BaseClass
         $mainId = $refund->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息39');
         }
         $debt = $main->debt ?? 0;
         $totalRemain = bcsub($debt, $amount, 2);
@@ -151,7 +151,7 @@ class CustomClass extends BaseClass
         $mainId = $clear->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息40');
         }
         $debt = $main->debt ?? 0;
         $totalRemain = bcsub($debt, $amount, 2);

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

@@ -766,7 +766,7 @@ class GoodsClass extends BaseClass
             ];
             $main = MainClass::getById($mainId, true);
             if (empty($main)) {
-                util::fail('没有main信息');
+                util::fail('没有main信息37');
             }
             WorkClass::goodsCreateFinish($params, $main);
         }

+ 1 - 1
biz-hd/order/classes/OrderClass.php

@@ -293,7 +293,7 @@ class OrderClass extends BaseClass
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息36');
         }
         $main->unSendOrder += 1;
         $main->unPayOrder -= 1;

+ 1 - 1
biz-hd/part/classes/PartClass.php

@@ -98,7 +98,7 @@ class PartClass extends BaseClass
         StockRecordClass::addRecordByOrder($stockData, StockRecordClass::STOCK_RECORD_TYPE_PART);
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息29');
         }
         $totalCost = 0;
         $totalNum = 0;

+ 4 - 4
biz-hd/purchase/classes/PurchaseClass.php

@@ -473,7 +473,7 @@ class PurchaseClass extends BaseClass
         }
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息12');
         }
         $main->cgUnSend -= 1;
         $main->cgFinish += 1;
@@ -962,7 +962,7 @@ class PurchaseClass extends BaseClass
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息13');
         }
         $main->totalPurchaseOrder += 1;
         $main->cgUnPay += 1;
@@ -1106,7 +1106,7 @@ class PurchaseClass extends BaseClass
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息14');
         }
         $main->cgUnPay -= 1;
         $main->cgCancel += 1;
@@ -1214,7 +1214,7 @@ class PurchaseClass extends BaseClass
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息15');
         }
         $main->cgSending -= 1;
         $main->cgFinish += 1;

+ 1 - 1
biz-hd/purchase/classes/PurchaseClearClass.php

@@ -172,7 +172,7 @@ class PurchaseClearClass extends BaseClass
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息11');
         }
         if ($order->onlinePay == dict::getDict('onlinePay', 'yes')) {
             //供货商门店余额增加

+ 1 - 1
biz-hd/purchase/services/PurchaseService.php

@@ -377,7 +377,7 @@ class PurchaseService extends BaseService
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息16');
         }
         $realPrice = $info->realPrice;
         $actPrice = $info->actPrice;

+ 1 - 1
biz-hd/px/classes/PxApplyClass.php

@@ -82,7 +82,7 @@ class PxApplyClass extends BaseClass
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息27');
         }
         $currentTotalIncome = bcadd($main->totalIncome, $actPrice, 2);
         $main->totalIncome = $currentTotalIncome;

+ 1 - 1
biz-mall/order/classes/OrderClass.php

@@ -140,7 +140,7 @@ class OrderClass extends BaseClass
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息33');
         }
         $riseNum = StatOrderCountClass::addOrder($shop, $main);
 

+ 1 - 1
biz/sj/classes/CashClass.php

@@ -185,7 +185,7 @@ class CashClass extends BaseClass
         $mainId = $shop->mainId ?? 0;
         $main = MainClass::getLockById($mainId);
         if (empty($main)) {
-            util::fail('没有main信息');
+            util::fail('没有main信息1');
         }
         $cash->remark = $remark;
         $cash->status = self::STATUS_CHECK_NO;

+ 1 - 1
console/controllers/CashController.php

@@ -37,7 +37,7 @@ class CashController extends Controller
                 $mainId = $shop->mainId ?? 0;
                 $main = MainClass::getLockById($mainId);
                 if (empty($main)) {
-                    noticeUtil::push("提现审核失败,没有main信息,orderSn:" . $orderSn, '15280215347');
+                    noticeUtil::push("提现审核失败,没有main信息32,orderSn:" . $orderSn, '15280215347');
                     continue;
                 }
                 $cashAmount = isset($cash->amount) ? floatval($cash->amount) : 0;