浏览代码

修复合成详情报错

jason 7 月之前
父节点
当前提交
1f213540d8
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 3 3
      application/api/controller/Synthesis.php
  2. 1 1
      application/api/controller/Test.php

+ 3 - 3
application/api/controller/Synthesis.php

@@ -49,13 +49,13 @@ class Synthesis extends Api
         $synthesis = SynthesisModel::getBySynthesis($id, $lan);
         if (!empty($synthesis)) {
             //条件一
-            $material_one = $productLists->getBySynthesisProduct($synthesis->material_one, $lan);
+            $material_one = $productLists->getBySynthesisProduct($synthesis->material_one, 1, $lan);
             $synthesis->material_one = $productOrder->getByOrderProductNum($material_one, $synthesis->material_one_num, $this->auth->id);
             //条件二
-            $material_two = $productLists->getBySynthesisProduct($synthesis->material_two, $lan);
+            $material_two = $productLists->getBySynthesisProduct($synthesis->material_two, 2, $lan);
             $synthesis->material_two = $productOrder->getByOrderProductNum($material_two, $synthesis->material_two_num, $this->auth->id);
             //条件三
-            $material_three = $productLists->getBySynthesisProduct($synthesis->material_three, $lan);
+            $material_three = $productLists->getBySynthesisProduct($synthesis->material_three, 2, $lan);
             $synthesis->material_three = $productOrder->getByOrderProductNum($material_three, $synthesis->material_three_num, $this->auth->id);
         }
         $this->success('', $synthesis);

+ 1 - 1
application/api/controller/Test.php

@@ -630,7 +630,7 @@ class Test
             ->where('type_id', 3)
             ->where('user_id', 'in', $order_list)
             ->update([
-                'create_time' => 1744819200
+                'create_time' => 1745942400
             ]);
         dump($rs);
     }