新制作单提示

app-hd/controllers/OrderController.php

@@ -734,9 +734,11 @@ class OrderController extends BaseController
 
             //如果需要生成制作单
             $needWork = $post['needWork'] ?? 0;
+            $hasWork = 0;
             if ($needWork == 1) {
                 $main = $this->main;
-                WorkClass::toDoWork($order, $main);
+                $workRet = WorkClass::toDoWork($order, $main);
+                $hasWork = $workRet['hasWork'] ?? 0;
             }
 
             $transaction->commit();
@@ -762,7 +764,7 @@ class OrderController extends BaseController
             $shop = ShopClass::getById($shopId, true);
             WxMessageClass::gatheringIncomeInform($shop, $order);
 
-            if ($needWork == 1) {
+            if ($hasWork == 1) {
                 //新制作单提示
                 $shopExt = ShopExtClass::getByCondition(['shopId' => $this->shopId], true);
                 ShopExtClass::newWorkRemind($shopExt, $order);

biz-hd/work/classes/WorkClass.php

@@ -127,6 +127,7 @@ class WorkClass extends BaseClass
         $sh = $data['sh'] ?? 0;
         $manyType = $data['manyType'] ?? 0;
         $sendNum = $data['sendNum'] ?? '';
+        $hasWork = 0;
 
         $ids = array_column($goods, 'productId');
         $info = GoodsClass::getByIds($ids, null, 'id');
@@ -208,8 +209,12 @@ class WorkClass extends BaseClass
                 'kindId' => $kindId,
                 'kindName' => $kindName,
             ];
-            self::createFinish($current, $main);
+            $work = self::createFinish($current, $main);
+            if (!empty($work)) {
+                $hasWork = 1;
+            }
         }
+        return ['hasWork' => $hasWork];
     }
 
     public static function createFinish($data, $main)
@@ -442,6 +447,7 @@ class WorkClass extends BaseClass
         $manyType = $order->manyType ?? 0;
         $sendNum = $order->sendNum ?? '';
         $hasReachTime = 0;
+        $hasWork = 0;
         $reachDate = $order->reachDate ?? '';
         if (!empty($reachDate) && $reachDate != '0000-00-00') {
             $hasReachTime = 1;
@@ -481,9 +487,11 @@ class WorkClass extends BaseClass
                     'manyType' => $manyType,
                     'sendNum' => $sendNum,
                 ];
-                WorkClass::goodsCreateFinish($params, $main);
+                $ret = WorkClass::goodsCreateFinish($params, $main);
+                $hasWork = $ret['hasWork'] ?? 0;
             }
         }
+        return ['hasWork' => $hasWork];
     }
 
 }