diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/service/impl/OrderCreateVipServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/service/impl/OrderCreateVipServiceImpl.java index 3faf98e..abd26c7 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/service/impl/OrderCreateVipServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/service/impl/OrderCreateVipServiceImpl.java @@ -426,8 +426,8 @@ public class OrderCreateVipServiceImpl implements OrderCreateVipService { if(msgBelece.getMoney().compareTo(money) == -1){ return Result.error("余额不足"); } - //拨打用户电话 - this.online(msgOrder); +// //拨打用户电话 +// this.online(msgOrder); @@ -466,9 +466,45 @@ public class OrderCreateVipServiceImpl implements OrderCreateVipService { //发送提示 this.sendSms(msgTechnician); + return Result.OK("支付成功"); + }else{ +// //拨打用户电话 +// this.online(msgOrder); +// + + //修改订单状态 + msgOrder.setState(1); + msgOrder.setPayTime(new Date()); + msgOrderService.updateById(msgOrder); + +// //短信发送给技师 +// smsClient.sendSms(msgTechnician.getPhone(),"您有一笔订单需要处理,订单号:"+msgOrder.getId()); + +// //增加流水 +// MsgWater wallet = new MsgWater(); +// wallet.setMoney(money); +// wallet.setTitle("余额支付订单"); +// wallet.setType(2); +// wallet.setUserId(hanHaiMember.getId()); +// wallet.setState(1); +// wallet.setCreateTime(new Date()); +// msgWaterService.save(wallet); + + +// //根据订单中的优惠券标识修改优惠券使用情况 +// if(bean.getCouponId() != null){ +// MsgCoupon msgCoupon = msgCouponService.getById(bean.getCouponId()); +// msgCoupon.setState(1); +// msgCoupon.setStateTime(new Date()); +// msgCouponService.updateById(msgCoupon); +// } + + //发送提示 + this.sendSms(msgTechnician); + return Result.OK("支付成功"); } - return null; + }