|
@@ -126,10 +126,13 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
|
|
if (!orderNew.getnStatus().equals(OrderStatusEnum.WAIT_PAY.getCode())) {
|
|
if (!orderNew.getnStatus().equals(OrderStatusEnum.WAIT_PAY.getCode())) {
|
|
throw new ServiceException("该订单已经支付或者超时被取消");
|
|
throw new ServiceException("该订单已经支付或者超时被取消");
|
|
}
|
|
}
|
|
- TJs js = jsService.getById(orderNew.getcJsId());
|
|
|
|
- if (null == js || js.getnStatus().equals(JsStatusEnum.JS_SERVICE.getCode())) {
|
|
|
|
- throw new ServiceException("该技师已在服务中请重新下单");
|
|
|
|
|
|
+ if(StringUtils.isBlank(orderNew.getParentNo())){
|
|
|
|
+ TJs js = jsService.getById(orderNew.getcJsId());
|
|
|
|
+ if (null == js || js.getnStatus().equals(JsStatusEnum.JS_SERVICE.getCode())) {
|
|
|
|
+ throw new ServiceException("该技师已在服务中请重新下单");
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
// 从对应账户扣款
|
|
// 从对应账户扣款
|
|
TWxUser user = wxUserService.getByOpenId(orderNew.getcOpenId());
|
|
TWxUser user = wxUserService.getByOpenId(orderNew.getcOpenId());
|
|
if (null == user) {
|
|
if (null == user) {
|