|
|
@@ -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);
|