|
|
@@ -780,7 +780,6 @@ class WholeController extends Curd
|
|
|
->select('goods_id', 'goods_name', 'goods_classify')
|
|
|
->first();
|
|
|
if (!$goods) {
|
|
|
- Db::rollBack();
|
|
|
return json_fail('产品数据异常');
|
|
|
}
|
|
|
$goods = $goods->toArray();
|
|
|
@@ -1357,7 +1356,6 @@ class WholeController extends Curd
|
|
|
->select('goods_id', 'goods_name', 'goods_classify')
|
|
|
->first();
|
|
|
if (!$goods) {
|
|
|
- Db::rollBack();
|
|
|
return json_fail('产品数据异常');
|
|
|
}
|
|
|
$goods = $goods->toArray();
|
|
|
@@ -1398,7 +1396,7 @@ class WholeController extends Curd
|
|
|
$constituteAmount = $constituteAmount + $item['amount'];
|
|
|
}
|
|
|
if ($params['order_amount_pay'] != $constituteAmount) {
|
|
|
- return json_fail('组合支付金额与应付金额不一致');
|
|
|
+ throw new BusinessException('组合支付金额与应付金额不一致');
|
|
|
}
|
|
|
if (!empty($params['pay_category_constitute']) && in_array('OFFLINE', $params['pay_category_constitute'])) { //线下付款
|
|
|
$order->order_status_system = $systemStatus;
|
|
|
@@ -1843,14 +1841,14 @@ class WholeController extends Curd
|
|
|
if ($params['settlement_now'] == 'Y' && $params['pay_constitute'] == 'N' && in_array($params['pay_category'], ['CASH', 'CARD', 'WELFARE'])) {
|
|
|
$code = $params['sms_code'];
|
|
|
if (!$code) {
|
|
|
- return json_fail("验证码错误，请重新输入");
|
|
|
+ throw new BusinessException('验证码错误，请重新输入');
|
|
|
}
|
|
|
$member = Member::find($params['join_order_member_id']);
|
|
|
$mobile = $member->member_mobile;
|
|
|
$key = "SMS:CODE:ORDER_PAY:" . $mobile;
|
|
|
$redisCode = Redis::get($key);
|
|
|
if ($redisCode != $code && $code != '123456') {
|
|
|
- return json_fail("验证码错误，请重新输入");
|
|
|
+ throw new BusinessException('验证码错误，请重新输入');
|
|
|
}
|
|
|
Redis::del($key);
|
|
|
}
|
|
|
@@ -1858,14 +1856,13 @@ class WholeController extends Curd
|
|
|
if ($params['settlement_now'] == 'Y' && $params['pay_constitute'] == 'N' && in_array($params['pay_category'], ['OFFLINE', 'MONEY'])) {
|
|
|
$password = $params['offline_password'];
|
|
|
if ($password != '666888') {
|
|
|
- return json_fail("密码错误，请重新输入");
|
|
|
+ throw new BusinessException('密码错误，请重新输入');
|
|
|
}
|
|
|
}
|
|
|
// 下单账户
|
|
|
if (empty($params['join_order_member_id']) && !empty($params['mobile'])) {
|
|
|
if (Member::where('member_mobile', $params['mobile'])->exists()) {
|
|
|
- Db::rollBack();
|
|
|
- return json_fail('会员已存在');
|
|
|
+ throw new BusinessException('会员已存在');
|
|
|
}
|
|
|
$params['join_order_member_id'] = $params['member_id'] = 'MR' . date('YmdHis') . random_string(6, 'up');
|
|
|
// 创建会员
|
|
|
@@ -1874,8 +1871,7 @@ class WholeController extends Curd
|
|
|
$params['join_order_member_id'] = Member::where('member_mobile', '0000')->value('member_id');
|
|
|
}
|
|
|
if (empty($params['join_order_member_id'])) {
|
|
|
- Db::rollBack();
|
|
|
- return json_fail("检查下单账户");
|
|
|
+ throw new BusinessException('检查下单账户');
|
|
|
}
|
|
|
|
|
|
$qrcodePayAmount = 0;
|
gorden