From ff2d52126ef09b4968e1437e86509786a1dbab18 Mon Sep 17 00:00:00 2001 From: mashuai Date: Mon, 24 Feb 2025 17:59:31 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lease/mapper/MaLeaseInfoMapper.java | 7 +++++ .../service/impl/MaLeaseInfoServiceImpl.java | 3 +- .../order/service/impl/OrderServiceImpl.java | 9 ++++++ .../material/lease/MaLeaseInfoMapper.xml | 28 +++++++++++++++++++ 4 files changed, 46 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java index 2e22a5e..9f88acc 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java @@ -131,4 +131,11 @@ public interface MaLeaseInfoMapper { List getLeaseStatusCount(MaLeaseInfo info); List getLeaseCountByPublishCompany(); + + /** + * 驳回时修改信息 + * @param maLeaseInfo + * @return + */ + int updateRejectDevInfo(MaLeaseInfo maLeaseInfo); } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java index 0f47852..a87e34f 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/service/impl/MaLeaseInfoServiceImpl.java @@ -426,6 +426,7 @@ public class MaLeaseInfoServiceImpl implements MaLeaseInfoService { } @Override + @Transactional(rollbackFor = Exception.class) public AjaxResult agreeOrReject(MaLeaseInfo maLeaseInfo) { int result = 0; if (maLeaseInfo.getId() == null) { @@ -461,7 +462,6 @@ public class MaLeaseInfoServiceImpl implements MaLeaseInfoService { } if (maLeaseInfo.getLeaseStatus() == 4) { maLeaseInfo.setRejectUser(String.valueOf(SecurityUtils.getUserId())); - result = leaseInfoMapper.updateDevInfo(maLeaseInfo); MaLeaseInfo leaseInfo = leaseInfoMapper.getDevInfoById(maLeaseInfo.getId()); BmMessage bmMessage = new BmMessage(); bmMessage.setCreateTime(DateUtils.getNowDate()); @@ -485,6 +485,7 @@ public class MaLeaseInfoServiceImpl implements MaLeaseInfoService { list.add(bmMessage); (SpringUtils.getBean(RedisService.class)).setCacheObject(msgKey, list, MaterialConstants.CACHE_MATERIAL_MALL_MESSAGE_HOURS, TimeUnit.HOURS); bmMessageMapper.insertBmMessage(bmMessage); + result = leaseInfoMapper.updateRejectDevInfo(maLeaseInfo); } return result > 0 ? AjaxResult.success(HttpCodeEnum.SUCCESS.getMsg()) : AjaxResult.error(HttpCodeEnum.FAIL.getCode(), HttpCodeEnum.FAIL.getMsg()); } 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 60f1f91..09a6fd6 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 @@ -312,6 +312,15 @@ public class OrderServiceImpl implements OrderService { } } } + // 订单完成，修改装备为下架状态 + if (orderInfoDto.getOrderStatus().equals(OrderStatusEnum.ORDER_FINISHED.getStatus().toString())) { + if (dtos.size() > 0 && CollectionUtil.isNotEmpty(dtos)) { + for (OrderDetailDto dto : dtos) { + dto.setMaStatus(MaStatusEnum.ON_HIRE.getCode().toString()); + orderMapper.updateDeviceStatus(dto); + } + } + } String userName = SecurityUtils.getLoginUser().getUsername(); Integer i = orderMapper.updateOrderStatus(orderInfoDto.getOrderId(), orderInfoDto.getMaIds(), orderInfoDto.getOrderStatus(), userName, orderInfoDto.getOrderRemark()); if (!CollectionUtils.isEmpty(dtos)) { diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml index 985db09..85e3bdb 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml @@ -105,6 +105,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where lease_id = #{id} + + update ma_lease_info + + lease_name = #{leaseName}, + province_code = #{provinceCode}, + city_code = #{cityCode}, + area_code = #{areaCode}, + address = #{address}, + lease_start_time = #{leaseStartTime}, + lease_end_time = #{leaseEndTime}, + lease_status = #{leaseStatus}, + start_time = #{startTime}, + publish_user = #{publishUser}, + end_time = #{endTime}, + person = #{person}, + person_phone = #{personPhone}, + description = #{description}, + update_by = #{updateBy}, + update_time = #{updateTime}, + order_user = NULL, + order_company = NULL, + order_time = NULL, + agree_user = #{agreeUser}, + reject_user = #{rejectUser}, + + where id = #{id} + + delete from ma_lease_info where id = #{id} From c62c65e34f65b89d38751db943d0a3acbf71416e Mon Sep 17 00:00:00 2001 From: syruan <321359594@qq.com> Date: Mon, 24 Feb 2025 18:27:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/service/impl/OrderServiceImpl.java | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) 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 09a6fd6..5c7f051 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 @@ -12,7 +12,9 @@ import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.SpringUtils; import com.bonus.common.core.utils.StringUtils; import com.bonus.common.core.utils.encryption.Sm4Utils; +import com.bonus.common.core.utils.sms.SmsUtils; import com.bonus.common.redis.service.RedisService; +import com.bonus.common.security.service.SmsService; import com.bonus.common.security.utils.SecurityUtils; import com.bonus.material.basic.domain.BmMessage; import com.bonus.material.basic.mapper.BmMessageMapper; @@ -71,6 +73,9 @@ public class OrderServiceImpl implements OrderService { @Resource private RedisService redisService; + @Resource + private SmsService smsService; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); @Override @@ -117,6 +122,19 @@ public class OrderServiceImpl implements OrderService { orderDetailDto.setOrderId(orderInfoDto.getOrderId()); orderMapper.insertOrderDetail(orderDetailDto); } + String loginUserPhone = SecurityUtils.getLoginUser().getSysUser().getPhonenumber(); + if (loginUserPhone != null && !loginUserPhone.isEmpty()) { + if (loginUserPhone.length() == 11) { + SmsUtils.smsToken(loginUserPhone, "订单编号:" + code + "已下单，请尽快处理。", ""); + } else if (loginUserPhone.length() > 11) { + SmsUtils.smsToken(Sm4Utils.decrypt(loginUserPhone), "订单编号:" + code + "已下单，请尽快处理。", ""); + } else { + System.err.println("-----------用户绑定手机号,格式异常!!!---------------"); + } + } else { + System.err.println("-----------用户未绑定手机号,获取登录手机号为空---------------"); + } + } TmTask tmTask = new TmTask(); tmTask.setTaskType(TmTaskTypeEnum.TM_TASK_ORDER.getTaskTypeId());