|
@@ -620,17 +620,16 @@ class ApiController extends Controller
|
|
return response()->json(['status' => 'fail', 'info' => '保存失败']);
|
|
return response()->json(['status' => 'fail', 'info' => '保存失败']);
|
|
}
|
|
}
|
|
|
|
|
|
- if($type == 'pay') {
|
|
|
|
- return $this->makeOrder($request);
|
|
|
|
|
|
+ $money = $form_set->money;
|
|
|
|
+
|
|
|
|
+ if($type == 'pay' && !empty($money)) {
|
|
|
|
+ return $this->makeOrder($request, $money);
|
|
}
|
|
}
|
|
return response()->json(['status' => 'success', 'info' => '提交成功']);
|
|
return response()->json(['status' => 'success', 'info' => '提交成功']);
|
|
}
|
|
}
|
|
|
|
|
|
- public function makeOrder(Request $request)
|
|
|
|
|
|
+ public function makeOrder(Request $request, $money)
|
|
{
|
|
{
|
|
- if(empty($request->input('money'))) {
|
|
|
|
- return response()->json(['status' => 'fail', 'info' => '金额错误']);
|
|
|
|
- }
|
|
|
|
if(empty($request->input('id')) || empty($we_chat_user = WeChatUser::find($request->input('id')))) {
|
|
if(empty($request->input('id')) || empty($we_chat_user = WeChatUser::find($request->input('id')))) {
|
|
return response()->json(['status' => 'fail', 'info' => '找不到用户']);
|
|
return response()->json(['status' => 'fail', 'info' => '找不到用户']);
|
|
}
|
|
}
|