|
@@ -405,8 +405,6 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
if (order.getPayType().equals(MassageConstants.INTEGER_ONE)) {
|
|
if (order.getPayType().equals(MassageConstants.INTEGER_ONE)) {
|
|
//微信支付
|
|
//微信支付
|
|
R resp = rechargeService.getPay(orderNew.getOrderNo(), orderNew.getTotalPrice(), orderNew.getcOpenId(), BillTypeEnum.WX_PAY.getInfo(), BillTypeEnum.WX_PAY.getCode().toString());
|
|
R resp = rechargeService.getPay(orderNew.getOrderNo(), orderNew.getTotalPrice(), orderNew.getcOpenId(), BillTypeEnum.WX_PAY.getInfo(), BillTypeEnum.WX_PAY.getCode().toString());
|
|
- //电话通知
|
|
|
|
- Sendvoice.sendPhone(js.getcPhone());
|
|
|
|
return resp;
|
|
return resp;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -419,8 +417,6 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
throw new ServiceException("账户金额不够请充值");
|
|
throw new ServiceException("账户金额不够请充值");
|
|
} else {
|
|
} else {
|
|
orderPayManage(user, orderNew);
|
|
orderPayManage(user, orderNew);
|
|
- //电话通知
|
|
|
|
- Sendvoice.sendPhone(js.getcPhone());
|
|
|
|
return R.ok();
|
|
return R.ok();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -501,6 +497,8 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
updateJs(orderNew);
|
|
updateJs(orderNew);
|
|
updateById(orderParam);
|
|
updateById(orderParam);
|
|
this.newOrderNotification(orderNew);
|
|
this.newOrderNotification(orderNew);
|
|
|
|
+ //电话通知
|
|
|
|
+ Sendvoice.sendPhone(orderNew.getcPhone());
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|