From f10a7c29f1a3748b28d2809335625c7888473b26 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 22 九月 2025 22:21:19 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
index b5a1724..abf0747 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java
@@ -103,7 +103,7 @@
merConsumerGoodsVo.setNoSureList(noSureList);
}
List<MerConsumerGoodsListVo> sureList = consumerGoodsMapper.listMerConsumerGoods(merConsumerGoodsDto);
- Member member = remoteMemberService.getMember(merConsumerGoodsDto.getUserId()).getData();
+ Member member = remoteMemberService.getMember(merConsumerGoodsDto.getMemberUserId()).getData();
String lastServiceId = member.getLastServiceId();
if (StringUtils.isNotEmpty(lastServiceId)) {
List<String> list = JSON.parseArray(lastServiceId, String.class);
@@ -126,6 +126,8 @@
if(oldConsumerGoods.getSureNum()==null||oldConsumerGoods.getSureNum()<1){
throw new ServiceException(AppErrorConstant.GOODS_SURE_FAILED);
}
+ Member member = remoteMemberService.getMember(merSureConsumerGoodsDto.getMemberUserId()).getData();
+ Shop shop = remoteShopService.getShop(merSureConsumerGoodsDto.getShopId()).getData();
List<MerSureConsumerGoodsListDto> merSureConsumerGoodsListDtoList = merSureConsumerGoodsDto.getMerSureConsumerGoodsListDtoList();
if(merSureConsumerGoodsListDtoList!=null && !merSureConsumerGoodsListDtoList.isEmpty()){
ConsumerGoods consumerGoods;
@@ -182,6 +184,15 @@
sureNum = sureNum + 1;
}
}
+
+ String msg = "{\"name\":\"" + (StringUtils.isEmpty(member.getRealName()) ? member.getNickName() : member.getRealName()) + "\"," +
+ "\"store\":\"" + shop.getShopName() + "\",\"product\":\"" + goods.getGoodsName() + "\"}";
+ try {
+ MsgUtils.sendMsg(member.getMobile(), "SMS_491320362", msg);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+
}
//判断商品确认次数
if (sureNum > oldConsumerGoods.getSureNum()) {
@@ -321,7 +332,7 @@
//保存本次确认的服务商品id，用于下次进入页面后默认勾选上
List<String> collect = goodsList.stream().map(MerSureConsumerGoodsListDto::getConsumerGoodsId).collect(Collectors.toList());
- Member member = remoteMemberService.getMember(merSureConsumerGoodsDto.getUserId()).getData();
+ Member member = remoteMemberService.getMember(merSureConsumerGoodsDto.getMemberUserId()).getData();
member.setLastServiceId(JSON.toJSONString(collect));
remoteMemberService.editMember(member);
--
Gitblit v1.7.1