From 9f92aa108c24a67fabe80977cede0e0352318681 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 10 九月 2025 19:11:17 +0800
Subject: [PATCH] 扫码修改地址
---
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java | 170 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 140 insertions(+), 30 deletions(-)
diff --git a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
index 2b65ab7..9d38114 100644
--- a/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
+++ b/framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java
@@ -27,8 +27,11 @@
import cn.lili.modules.goods.entity.dos.Goods;
import cn.lili.modules.goods.entity.dto.GoodsCompleteMessage;
import cn.lili.modules.goods.service.GoodsService;
+import cn.lili.modules.lmk.domain.vo.OrderCountVO;
import cn.lili.modules.lmk.enums.general.AdminRoleEnum;
+import cn.lili.modules.member.entity.dos.Member;
import cn.lili.modules.member.entity.dto.MemberAddressDTO;
+import cn.lili.modules.member.mapper.MemberMapper;
import cn.lili.modules.order.cart.entity.dto.TradeDTO;
import cn.lili.modules.order.cart.entity.enums.DeliveryMethodEnum;
import cn.lili.modules.order.order.aop.OrderLogPoint;
@@ -68,6 +71,7 @@
import cn.lili.trigger.util.DelayQueueTools;
import cn.lili.utils.COSUtil;
import cn.lili.utils.CommonUtil;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -83,17 +87,22 @@
import org.apache.poi.ss.util.CellRangeAddressList;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.apache.rocketmq.spring.core.RocketMQTemplate;
+import org.redisson.api.RedissonClient;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
+import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import cn.lili.modules.permission.entity.dos.Role;
/**
@@ -108,6 +117,8 @@
private static final String ORDER_SN_COLUMN = "order_sn";
+ @Autowired
+ private MemberMapper memberMapperMapper;
/**
* 寤舵椂浠诲姟
*/
@@ -185,7 +196,11 @@
@Autowired
private AdminUserService adminUserService;
+ @Resource
+ private RedisTemplate<Object,Object> redisTemplate;
+ private final static String LOCK_ORDER_NO_MQ="lock_order_no_mq:";
+ private final static String LOCK_EDIT_ORDER_ADDRESS="lock_edit_order_address:";
@Override
@Transactional(rollbackFor = Exception.class)
public void intoDB(TradeDTO tradeDTO) {
@@ -240,23 +255,57 @@
}
@Override
- public IPage<OrderSimpleVO> queryByParams(OrderSearchParams orderSearchParams) {
+ public OrderCountVO countByIdOrder(String id) {
+ OrderSearchParams orderSearchParams = new OrderSearchParams();
+
+ orderSearchParams.setOrderStatus(OrderStatusEnum.COMPLETED.name());
+ orderSearchParams.setMemberId(id);
+ QueryWrapper queryWrapper = orderSearchParams.queryWrapper();
+ queryWrapper.groupBy("o.id");
+ queryWrapper.orderByDesc("o.id");
+ List<OrderSimpleVO> list = this.baseMapper.queryByParamsCount(queryWrapper);
+ OrderCountVO orderCountVO = new OrderCountVO();
+ orderCountVO.setOrderNumCount(0);
+ orderCountVO.setOrderPriceCount(BigDecimal.ZERO);
+ if (CollectionUtil.isEmpty(list)) {
+ return orderCountVO;
+ }else {
+ for (OrderSimpleVO vo : list) {
+ if (vo == null) {
+ System.out.println("鍑虹幇绌哄厓绱�");
+ continue; // 璺宠繃null鍏冪礌锛屾垨鏍规嵁涓氬姟澶勭悊
+ }
+ orderCountVO.setOrderNumCount(orderCountVO.getOrderNumCount() + 1);
+
+ // 閲戦绱姞锛氱敤BigDecimal澶勭悊锛岄伩鍏嶇簿搴﹂棶棰�
+ BigDecimal flowPrice = vo.getFlowPrice() != null ?
+ BigDecimal.valueOf(vo.getFlowPrice()) : BigDecimal.ZERO;
+
+ // 鐢˙igDecimal鐨刟dd鏂规硶绱姞
+ BigDecimal totalPrice = orderCountVO.getOrderPriceCount().add(flowPrice);
+ orderCountVO.setOrderPriceCount(totalPrice);
+
+ }
+ }
+ return orderCountVO;
+ }
+ @Override
+ public IPage<OrderSimpleVO> queryByParams(OrderSearchParams orderSearchParams,Boolean needHide) {
QueryWrapper queryWrapper = orderSearchParams.queryWrapper();
queryWrapper.groupBy("o.id");
queryWrapper.orderByDesc("o.id");
IPage<OrderSimpleVO> page = this.baseMapper.queryByParams(PageUtil.initPage(orderSearchParams), queryWrapper);
-
- if (!adminUserService.havePermissionRole(AdminRoleEnum.ORDER_INFO_PERMISSION)){
- for (OrderSimpleVO vo : page.getRecords()){
- vo.setConsigneeName(CommonUtil.maskName(vo.getConsigneeName()));
- vo.setConsigneeMobile(CommonUtil.maskMobile(vo.getConsigneeMobile()));
+ if (needHide){
+ if (!adminUserService.havePermissionRole(AdminRoleEnum.ORDER_INFO_PERMISSION)){
+ for (OrderSimpleVO vo : page.getRecords()){
+ vo.setConsigneeName(CommonUtil.maskName(vo.getConsigneeName()));
+ vo.setConsigneeMobile(CommonUtil.maskMobile(vo.getConsigneeMobile()));
+ }
}
}
+
return page;
}
-
-
-
@Override
public IPage<OrderSimpleXcxVO> queryByXcxParams(OrderSearchXcxParams orderSearchParams) {
QueryWrapper queryWrapper = orderSearchParams.queryWrapper();
@@ -405,8 +454,6 @@
vo.setConsigneeMobile(CommonUtil.maskMobile(vo.getConsigneeMobile()));
}
}
-
-
XSSFWorkbook workbook = initOrderExportData(orderExportDTOS);
try {
// 璁剧疆鍝嶅簲澶�
@@ -442,10 +489,27 @@
//鏌ヨ璁㈠崟鍜岃嚜璁㈠崟锛岀劧鍚庡啓鍏o杩斿洖
return new OrderDetailVO(order, orderItems, orderLogs, receipt);
}
+ @Override
+ public OrderDetailVO queryEditAddressDetail(String orderSn) {
+ Order order = this.getBySn(orderSn);
+ if (order == null) {
+ throw new ServiceException(ResultCode.ORDER_NOT_EXIST);
+ }
+ //鏌ヨ璁㈠崟椤逛俊鎭�
+ List<OrderItem> orderItems = orderItemService.getByOrderSn(orderSn);
+
+ //鏌ヨ璁㈠崟鍜岃嚜璁㈠崟锛岀劧鍚庡啓鍏o杩斿洖
+ return new OrderDetailVO(order, orderItems, null, null);
+ }
@Override
@Transactional
public String sendMqMessage(String snNo) {
+ //闄愬埗30绉掑彧鑳借姹備竴娆￠伩鍏嶅嚭鐜伴噸鏂版彁浜ら棶棰�
+ Boolean b = redisTemplate.opsForValue().setIfAbsent(LOCK_ORDER_NO_MQ + snNo, snNo,30, TimeUnit.SECONDS);
+ if ( Boolean.FALSE.equals(b)){
+ throw new ServiceException("璇峰湪30绉掑悗閲嶈瘯");
+ }
Order order = this.getBySn(snNo);
if (order == null) {
throw new ServiceException(ResultCode.ORDER_NOT_EXIST);
@@ -493,6 +557,7 @@
throw new ServiceException(ResultCode.ORDER_CAN_NOT_CANCEL);
}
}
+
@Override
@@ -614,16 +679,52 @@
return order;
}
+ @Override
+ @SystemLogPoint(description = "淇敼璁㈠崟", customerLog = "'璁㈠崟[' + #orderSn + ']鏀惰揣淇℃伅淇敼锛屼慨鏀逛负'+#memberAddressDTO.consigneeDetail")
+ @Transactional(rollbackFor = Exception.class)
+ public Order updateAddressConsignee(String orderSn, MemberAddressDTO memberAddressDTO) {
+ Order order = this.getBySn(orderSn);
+ if (order == null) {
+ throw new ServiceException(ResultCode.ORDER_NOT_EXIST);
+ }
+ //闄愬埗30绉掑彧鑳借姹備竴娆￠伩鍏嶅嚭鐜伴噸鏂版彁浜ら棶棰�
+ Boolean b = redisTemplate.opsForValue().setIfAbsent(LOCK_EDIT_ORDER_ADDRESS + orderSn, orderSn,30, TimeUnit.SECONDS);
+ if ( Boolean.FALSE.equals(b)){
+ throw new ServiceException("璇峰湪30绉掑悗閲嶈瘯");
+ }
+ String modifyAddressFlag = order.getModifyAddressFlag();
+ if (StringUtils.isNotBlank(modifyAddressFlag)) {
+ throw new ServiceException("褰撳墠璁㈠崟宸茬粡琚鍙�");
+ }
+ QueryWrapper<Order> wrapper = new QueryWrapper<>();
+ wrapper.eq("id", order.getId());
+ // 浣跨敤 last 鏂规硶鎷兼帴 FOR UPDATE 璇彞
+ wrapper.last("FOR UPDATE");
+ baseMapper.selectOne(wrapper);
+ //瑕佽褰曚箣鍓嶇殑鏀惰揣鍦板潃锛屾墍浠ラ渶瑕佷互浠ｇ爜鏂瑰紡杩涜璋冪敤 涓嶉噰鐢ㄦ敞瑙�
+ String message = "璁㈠崟[" + orderSn + "]鏀惰揣淇℃伅淇敼锛岀敱[" +order.getConsigneeAddressPath()+ order.getConsigneeDetail() + "]淇敼涓篬" + memberAddressDTO.getConsigneeAddressPath()+ memberAddressDTO.getConsigneeDetail() + "]";
+ //璁板綍璁㈠崟鎿嶄綔鏃ュ織
+ BeanUtil.copyProperties(memberAddressDTO, order);
+ order.setModifyAddressFlag(ModifyAddressEnums.USED.name());
+ this.updateById(order);
+ OrderLog orderLog = new OrderLog(orderSn, UserContext.getCurrentUser().getId(), UserContext.getCurrentUser().getRole().getRole(),
+ UserContext.getCurrentUser().getUsername(), message);
+ orderLogService.save(orderLog);
+ return order;
+ }
@Override
@OrderLogPoint(description = "'璁㈠崟['+#orderSn+']鍙戣揣锛屽彂璐у崟鍙穂'+#logisticsNo+']'", orderSn = "#orderSn")
@Transactional(rollbackFor = Exception.class)
public Order delivery(String orderSn, String logisticsNo, String logisticsId) {
Order order = OperationalJudgment.judgment(this.getBySn(orderSn));
//濡傛灉璁㈠崟鏈彂璐э紝骞朵笖璁㈠崟鐘舵�佸�肩瓑浜庡緟鍙戣揣
+ log.info("鑾峰彇鍒扮殑璁㈠崟淇℃伅涓簕}", JSON.toJSONString(order));
if (order.getDeliverStatus().equals(DeliverStatusEnum.UNDELIVERED.name()) && order.getOrderStatus().equals(OrderStatusEnum.UNDELIVERED.name())) {
//鑾峰彇瀵瑰簲鐗╂祦
Logistics logistics = logisticsService.getById(logisticsId);
+ log.info("鑾峰彇鍒扮殑鐗╂祦淇℃伅id涓簕}", logisticsId);
+ log.info("鑾峰彇鍒扮殑鐗╂祦淇℃伅涓簕}", JSON.toJSONString(logistics));
if (logistics == null) {
throw new ServiceException(ResultCode.ORDER_LOGISTICS_ERROR);
}
@@ -1290,6 +1391,12 @@
this.update(new LambdaUpdateWrapper<Order>()
.eq(Order::getSn, orderSn)
.set(Order::getOrderStatus, orderStatusEnum.name()));
+ //淇敼璁㈠崟鍟嗗搧 todo 鎵�鏈夌殑璁㈠崟闇�瑕佸鏍稿悗鎵嶈兘閫�娆�
+ orderItemService.update(new LambdaUpdateWrapper<OrderItem>()
+ .eq(OrderItem::getOrderSn,orderSn)
+ .set(OrderItem::getAfterSaleStatus, OrderItemAfterSaleStatusEnum.NOT_APPLIED.name())
+ .set(OrderItem::getCommentStatus,CommentStatusEnum.UNFINISHED.name())
+ .set(OrderItem::getComplainStatus, OrderComplaintStatusEnum.NO_APPLY.name()));
//淇敼璁㈠崟
OrderMessage orderMessage = new OrderMessage();
orderMessage.setNewStatus(orderStatusEnum);
@@ -1412,7 +1519,7 @@
// 鍒涘缓琛ㄥご
Row header = sheet.createRow(0);
String[] headers = {"涓昏鍗曠紪鍙�", "瀛愯鍗曠紪鍙�", "閫夎喘鍟嗗搧", "鍟嗗搧鏁伴噺", "鍟嗗搧ID", "鍟嗗搧鍗曚环", "璁㈠崟搴斾粯閲戦",
- "杩愯垂", "浼樻儬鎬婚噾棰�", "骞冲彴浼樻儬", "鍟嗗浼樻儬", "鍟嗗鏀逛环", "鏀粯鏂瑰紡", "鏀朵欢浜�", "鏀朵欢浜烘墜鏈哄彿",
+ "杩愯垂", "浼樻儬鎬婚噾棰�", "骞冲彴浼樻儬", "鍟嗗浼樻儬", "鍟嗗鏀逛环", "鏀粯鏂瑰紡","涔板鍚嶇О", "鏀朵欢浜�", "鏀朵欢浜烘墜鏈哄彿",
"鐪�", "甯�", "鍖�", "琛楅亾", "璇︾粏鍦板潃", "涔板鐣欒█", "璁㈠崟鎻愪氦鏃堕棿", "鏀粯瀹屾垚鏃堕棿", "鏉ユ簮",
"璁㈠崟鐘舵��", "璁㈠崟绫诲瀷", "鍞悗鐘舵��", "鍙栨秷鍘熷洜", "鍙戣揣鏃堕棿", "瀹屾垚鏃堕棿", "搴楅摵"};
@@ -1437,24 +1544,27 @@
row.createCell(10).setCellValue(dto.getStoreMarketingCost()!=null?dto.getStoreMarketingCost():0);
row.createCell(11).setCellValue(dto.getUpdatePrice()!=null?dto.getUpdatePrice():0);
row.createCell(12).setCellValue(dto.getPaymentMethod());
- row.createCell(13).setCellValue(dto.getConsigneeName());
- row.createCell(14).setCellValue(dto.getConsigneeMobile());
- row.createCell(15).setCellValue(dto.getProvince());
- row.createCell(16).setCellValue(dto.getCity());
- row.createCell(17).setCellValue(dto.getDistrict());
- row.createCell(18).setCellValue(dto.getStreet());
- row.createCell(19).setCellValue(dto.getConsigneeDetail());
- row.createCell(20).setCellValue(dto.getRemark());
- row.createCell(21).setCellValue(dto.getCreateTime());
- row.createCell(22).setCellValue(dto.getPaymentTime());
- row.createCell(23).setCellValue(dto.getClientType());
- row.createCell(24).setCellValue(dto.getOrderStatus());
- row.createCell(25).setCellValue(dto.getOrderType());
- row.createCell(26).setCellValue(dto.getAfterSaleStatus());
- row.createCell(27).setCellValue(dto.getCancelReason());
- row.createCell(28).setCellValue(dto.getLogisticsTime());
- row.createCell(29).setCellValue(dto.getCompleteTime());
- row.createCell(30).setCellValue(dto.getStoreName());
+
+ row.createCell(13).setCellValue(dto.getNickName());
+
+ row.createCell(14).setCellValue(dto.getConsigneeName());
+ row.createCell(15).setCellValue(dto.getConsigneeMobile());
+ row.createCell(16).setCellValue(dto.getProvince());
+ row.createCell(17).setCellValue(dto.getCity());
+ row.createCell(18).setCellValue(dto.getDistrict());
+ row.createCell(19).setCellValue(dto.getStreet());
+ row.createCell(20).setCellValue(dto.getConsigneeDetail());
+ row.createCell(21).setCellValue(dto.getRemark());
+ row.createCell(22).setCellValue(dto.getCreateTime());
+ row.createCell(23).setCellValue(dto.getPaymentTime());
+ row.createCell(24).setCellValue(dto.getClientType());
+ row.createCell(25).setCellValue(dto.getOrderStatus());
+ row.createCell(26).setCellValue(dto.getOrderType());
+ row.createCell(27).setCellValue(dto.getAfterSaleStatus());
+ row.createCell(28).setCellValue(dto.getCancelReason());
+ row.createCell(29).setCellValue(dto.getLogisticsTime());
+ row.createCell(30).setCellValue(dto.getCompleteTime());
+ row.createCell(31).setCellValue(dto.getStoreName());
}
//淇敼鍒楀
--
Gitblit v1.8.0