shish 4 жил өмнө
parent
commit
cba4de5b28

+ 3 - 7
app-hd/controllers/OrderController.php

@@ -382,19 +382,15 @@ class OrderController extends BaseController
         $hasPay = $post['hasPay'] ?? dict::getDict('hasPay', 'unPay');
 
         $productJson = $post['product'] ?? '';
-        if (empty($productJson) && empty($groupId)) {
-            if (isset($post['lsGoodsPrice']) == false || $post['lsGoodsPrice'] <= 0) {
-                util::fail('请填写金额或选商品');
-            }
+        $productList = [];
+        if (!empty($productJson)) {
+            $productList = json_decode($productJson, true);
         }
-        $productList = json_decode($productJson, true);
         if (empty($productList) && empty($groupId)) {
             //商家上传图片开单并要求生成制作单
             if (isset($post['unitGoodsPrice']) && !empty($post['unitGoodsPrice'])) {
                 $productList = GoodsClass::kdWorkGoods($post);
-                print_r($productList);
             }
-            echo 'aaa';die;
         }
 
         if (empty($productList) && empty($groupId)) {

+ 14 - 0
app-hd/controllers/WorkController.php

@@ -4,6 +4,7 @@ namespace hd\controllers;
 
 use bizHd\goods\classes\CategoryClass;
 use bizHd\goods\classes\GoodsClass;
+use bizHd\order\classes\OrderClass;
 use bizHd\work\classes\WorkClass;
 use bizHd\work\classes\WorkItemClass;
 use common\components\dict;
@@ -17,6 +18,19 @@ class WorkController extends BaseController
 
     public $guestAccess = [];
 
+    //根据订单id查询制作单信息 ssh 20220625
+    public function actionGetInfoByOrderId()
+    {
+        $orderId = Yii::$app->request->get('orderId', 0);
+        $order = OrderClass::getById($orderId, true);
+        OrderClass::valid($order, $this->mainId);
+        $info = WorkClass::getByCondition(['orderId' => $orderId], true);
+        if (empty($info)) {
+            util::fail('没有找到');
+        }
+        util::success(['info' => $info]);
+    }
+
     //打印制作单 ssh 20220601
     public function actionPrint()
     {