diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java index f56c807..c6fd64f 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/basic/service/impl/ToDoServiceImpl.java @@ -19,8 +19,8 @@ public class ToDoServiceImpl implements ToDoService { @Resource private ToDoMapper toDoMapper; - @Resource - private RemoteUserService remoteUserService; +// @Resource +// private RemoteUserService remoteUserService; @Override public List getToDoList(ToDoBean bean) { diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java index 5c7f051..3903c15 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java @@ -89,15 +89,20 @@ public class OrderServiceImpl implements OrderService { if (orderDetailDtos.isEmpty()) { throw new RuntimeException("请正确添加设备"); } + //生成订单信息 + String code = "D" + System.currentTimeMillis(); + orderInfoDto.setCode(code); + DevInfo maInfo; for (OrderDetailDto orderDetailDto : orderDetailDtos) { // 先判断要租赁的设备状态是否正常 - DevInfo maInfo = devInfoMapper.getMaStatusByMaId(Long.valueOf(orderDetailDto.getMaId())); + maInfo = devInfoMapper.getMaStatusByMaId(Long.valueOf(orderDetailDto.getMaId())); if (maInfo == null || maInfo.getMaStatus() == null) { throw new RuntimeException("设备信息异常"); } if (!maInfo.getMaStatus().equals(MaStatusEnum.LISTING.getCode())) { throw new RuntimeException("设备非上架状态,无法下单!"); } + String devPersonPhone = maInfo.getPersonPhone(); //如果是编码设备,改设备状态为在租 orderDetailDto.setMaStatus(MaStatusEnum.UNDER_RENT.getCode().toString()); @@ -107,10 +112,20 @@ public class OrderServiceImpl implements OrderService { } // 更改购物车状态为已下单 orderMapper.updateMaStatus(orderDetailDto); + if (devPersonPhone != null) { + if (devPersonPhone.length() == 11) { + String sendResult = SmsUtils.smsToken(devPersonPhone, "订单编号:" + code + "已下单,请尽快处理。", ""); + System.out.println("短信发送结果:" + sendResult); + } else if (devPersonPhone.length() > 11) { + SmsUtils.smsToken(Sm4Utils.decrypt(devPersonPhone), "订单编号:" + code + "已下单,请尽快处理。", ""); + } else { + System.err.println("-----------用户绑定手机号,格式异常!!!---------------"); + } + } else { + System.err.println("-----------设备联系人手机号为空!!!---------------"); + } } - //生成订单信息 - String code = "D" + System.currentTimeMillis(); - orderInfoDto.setCode(code); + Long userid = SecurityUtils.getLoginUser().getUserid(); orderInfoDto.setBuyerId(userid.intValue()); orderInfoDto.setBuyerCompany(SecurityUtils.getLoginUser().getSysUser().getCompanyId().intValue()); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index 8d9c6fb..9f9a829 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -693,7 +693,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"