From 6db5d5a8fca3aa7e08190c2cfde2fa6cc72cfea2 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 04 九月 2025 14:21:48 +0800
Subject: [PATCH] 总金额计算问题
---
framework/src/main/java/cn/lili/modules/order/order/serviceimpl/OrderServiceImpl.java | 261 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 233 insertions(+), 28 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 296c304..8102863 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
@@ -1,6 +1,7 @@
package cn.lili.modules.order.order.serviceimpl;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.text.CharSequenceUtil;
@@ -15,28 +16,37 @@
import cn.lili.common.event.TransactionCommitSendMQEvent;
import cn.lili.common.exception.ServiceException;
import cn.lili.common.properties.RocketmqCustomProperties;
+import cn.lili.common.security.AuthUser;
import cn.lili.common.security.OperationalJudgment;
import cn.lili.common.security.context.UserContext;
import cn.lili.common.security.enums.UserEnums;
import cn.lili.common.utils.CurrencyUtil;
import cn.lili.common.utils.SnowFlake;
+import cn.lili.common.utils.StringUtils;
+import cn.lili.common.vo.ResultMessage;
+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;
import cn.lili.modules.order.order.entity.dos.*;
import cn.lili.modules.order.order.entity.dto.*;
import cn.lili.modules.order.order.entity.enums.*;
-import cn.lili.modules.order.order.entity.vo.OrderDetailVO;
-import cn.lili.modules.order.order.entity.vo.OrderSimpleVO;
-import cn.lili.modules.order.order.entity.vo.OrderVO;
-import cn.lili.modules.order.order.entity.vo.PaymentLog;
+import cn.lili.modules.order.order.entity.vo.*;
import cn.lili.modules.order.order.mapper.OrderMapper;
import cn.lili.modules.order.order.service.*;
import cn.lili.modules.order.trade.entity.dos.OrderLog;
import cn.lili.modules.order.trade.service.OrderLogService;
import cn.lili.modules.payment.entity.enums.PaymentMethodEnum;
+import cn.lili.modules.permission.entity.dos.AdminUser;
+import cn.lili.modules.permission.service.AdminUserService;
+import cn.lili.modules.permission.service.RoleService;
import cn.lili.modules.promotion.entity.dos.Pintuan;
import cn.lili.modules.promotion.service.PintuanService;
import cn.lili.modules.store.entity.dto.StoreDeliverGoodsAddressDTO;
@@ -59,12 +69,15 @@
import cn.lili.trigger.model.TimeExecuteConstant;
import cn.lili.trigger.model.TimeTriggerMsg;
import cn.lili.trigger.util.DelayQueueTools;
+import cn.lili.utils.COSUtil;
+import cn.lili.utils.CommonUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Cell;
@@ -73,19 +86,24 @@
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;
/**
* 瀛愯鍗曚笟鍔″眰瀹炵幇
*
@@ -98,6 +116,8 @@
private static final String ORDER_SN_COLUMN = "order_sn";
+ @Autowired
+ private MemberMapper memberMapperMapper;
/**
* 寤舵椂浠诲姟
*/
@@ -168,7 +188,17 @@
@Autowired
private SettingService settingService;
+ @Autowired
+ private GoodsService goodsService;
+ @Autowired
+ private COSUtil cosUtil;
+ @Autowired
+ private AdminUserService adminUserService;
+ @Resource
+ private RedisTemplate<Object,Object> redisTemplate;
+
+ private final static String LOCK_ORDER_NO_MQ="lock_order_no_mq:";
@Override
@Transactional(rollbackFor = Exception.class)
public void intoDB(TradeDTO tradeDTO) {
@@ -198,6 +228,12 @@
UserContext.getCurrentUser().getUsername(), message));
item.getCheckedSkuList().forEach(
sku -> {
+// OrderItem e = new OrderItem(sku, item, tradeDTO);
+// String goodsId = e.getGoodsId();
+// Goods goods = goodsService.getById(goodsId);
+// item.getPriceDetailDTO().setPlatFormCommissionPoint(Double.valueOf(goods.getCommission().toString()));
+// e.setPriceDetailDTO(item.getPriceDetailDTO());
+// orderItems.add(e);
orderItems.add(new OrderItem(sku, item, tradeDTO));
currentOrderItems.add(new OrderItem(sku, item, tradeDTO));
}
@@ -217,11 +253,127 @@
}
@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");
- return this.baseMapper.queryByParams(PageUtil.initPage(orderSearchParams), queryWrapper);
+ 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 (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();
+ queryWrapper.groupBy("o.id");
+ queryWrapper.orderByDesc("o.id");
+ IPage<OrderSimpleXcxVO> iPage = this.baseMapper.queryByXcxParams(PageUtil.initPage(orderSearchParams), queryWrapper);
+ Set<String> goodsIds = new HashSet<>();
+ for (OrderSimpleXcxVO orderSimpleVO : iPage.getRecords()) {
+ orderSimpleVO.setOrderItems(orderSimpleVO.initOrderItems());
+ String groupGoodsId = orderSimpleVO.getGroupGoodsId();
+ if (StringUtils.isNotBlank(groupGoodsId)) {
+ goodsIds.addAll(Arrays.asList(groupGoodsId.split(",")));
+ }
+ }
+ if (CollectionUtil.isNotEmpty(goodsIds)) {
+ List<Goods> list = goodsService.list(Wrappers.<Goods>lambdaQuery().in(Goods::getId, goodsIds));
+ Map<String, String> goodsVideos = list
+ .stream().collect(Collectors.toMap(Goods::getId, g->
+ StringUtils.isNotBlank(g.getGoodsVideo())?g.getGoodsVideo():""
+ ));
+ iPage.getRecords().forEach(orderSimpleVO -> {
+ orderSimpleVO.getOrderItems().forEach(orderItem -> {
+ String videoUrl = goodsVideos.get(orderItem.getGoodsId());
+ if (StringUtils.isNotBlank(videoUrl)&&!videoUrl.contains("http")) {
+ orderItem.setVideo(cosUtil.getPreviewUrl(videoUrl));
+ }
+ String image = orderItem.getImage();
+ if (StringUtils.isNotBlank(image)&&!image.contains("http")) {
+ orderItem.setImage(cosUtil.getPreviewUrl(image));
+ }
+ });
+ });
+ }
+ return iPage;
+ }
+
+ @Override
+ public IPage<OrderSimpleXcxVO> querySupplierOrderParams(SupplierOrderSearchParams orderSearchParams) {
+ QueryWrapper queryWrapper = orderSearchParams.queryWrapper();
+ queryWrapper.groupBy("o.id");
+ queryWrapper.orderByDesc("o.id");
+ IPage<OrderSimpleXcxVO> iPage = this.baseMapper.querySupplierOrderParams(PageUtil.initPage(orderSearchParams), queryWrapper);
+ Set<String> goodsIds = new HashSet<>();
+ for (OrderSimpleXcxVO orderSimpleVO : iPage.getRecords()) {
+ orderSimpleVO.setOrderItems(orderSimpleVO.initOrderItems());
+ String groupGoodsId = orderSimpleVO.getGroupGoodsId();
+ if (StringUtils.isNotBlank(groupGoodsId)) {
+ goodsIds.addAll(Arrays.asList(groupGoodsId.split(",")));
+ }
+ }
+ if (CollectionUtil.isNotEmpty(goodsIds)) {
+ List<Goods> list = goodsService.list(Wrappers.<Goods>lambdaQuery().in(Goods::getId, goodsIds));
+ Map<String, String> goodsVideos = list
+ .stream().collect(Collectors.toMap(Goods::getId, g->
+ StringUtils.isNotBlank(g.getGoodsVideo())?g.getGoodsVideo():""
+ ));
+ iPage.getRecords().forEach(orderSimpleVO -> {
+ orderSimpleVO.getOrderItems().forEach(orderItem -> {
+ String videoUrl = goodsVideos.get(orderItem.getGoodsId());
+ if (StringUtils.isNotBlank(videoUrl)&&!videoUrl.contains("http")) {
+ orderItem.setVideo(cosUtil.getPreviewUrl(videoUrl));
+ }
+ String image = orderItem.getImage();
+ if (StringUtils.isNotBlank(image)&&!image.contains("http")) {
+ orderItem.setImage(cosUtil.getPreviewUrl(image));
+ }
+ });
+ });
+ }
+ return iPage;
}
/**
@@ -292,8 +444,15 @@
@Override
public void queryExportOrder(HttpServletResponse response, OrderSearchParams orderSearchParams) {
+ List<OrderExportDTO> orderExportDTOS = this.baseMapper.queryExportOrder(orderSearchParams.queryWrapper());
- XSSFWorkbook workbook = initOrderExportData(this.baseMapper.queryExportOrder(orderSearchParams.queryWrapper()));
+ if (!adminUserService.havePermissionRole(AdminRoleEnum.ORDER_INFO_PERMISSION)){
+ for (OrderExportDTO vo : orderExportDTOS){
+ vo.setConsigneeName(CommonUtil.maskName(vo.getConsigneeName()));
+ vo.setConsigneeMobile(CommonUtil.maskMobile(vo.getConsigneeMobile()));
+ }
+ }
+ XSSFWorkbook workbook = initOrderExportData(orderExportDTOS);
try {
// 璁剧疆鍝嶅簲澶�
String fileName = URLEncoder.encode("璁㈠崟鍒楄〃", "UTF-8");
@@ -330,6 +489,30 @@
}
@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);
+ }
+ if (!OrderStatusEnum.PAID.name().equals(order.getOrderStatus())) {
+ throw new ServiceException("璁㈠崟鐘舵�佷笉鏄凡鏀粯鐘舵��");
+ }
+ OrderMessage orderMessage = new OrderMessage();
+ //鍙戦�佽鍗曞凡浠樻娑堟伅
+ orderMessage.setOrderSn(order.getSn());
+ orderMessage.setPaymentMethod(order.getPaymentMethod());
+ orderMessage.setNewStatus(OrderStatusEnum.PAID);
+ this.sendUpdateStatusMessage(orderMessage);
+ return null;
+ }
+
+ @Override
@OrderLogPoint(description = "'璁㈠崟['+#orderSn+']鍙栨秷锛屽師鍥犱负锛�'+#reason", orderSn = "#orderSn")
@Transactional(rollbackFor = Exception.class)
public Order cancel(String orderSn, String reason) {
@@ -360,6 +543,7 @@
throw new ServiceException(ResultCode.ORDER_CAN_NOT_CANCEL);
}
}
+
@Override
@@ -411,7 +595,25 @@
//璁板綍搴楅摵璁㈠崟鏀粯娴佹按
storeFlowService.payOrder(orderSn);
-
+ //todo 鐢熸垚璁㈠崟璁板綍琛�
+// //鑾峰彇瀛愯鍗曟暟鎹�
+// List<OrderItem> orderItems = orderItemService.getByOrderSn(orderSn);
+// List<String> goodsIds = orderItems.stream().map(OrderItem::getGoodsId).distinct().collect(Collectors.toList());
+//
+// Map<String, OrderItem> orderItem = orderItems.stream()
+// .collect(Collectors.toMap(OrderItem::getGoodsId, Function.identity()
+// ,(oldValue, newValue) -> oldValue));
+// //鏍规嵁璁㈠崟item椤瑰垱寤烘娊鎴愭祦姘磋鍗�
+// List<CommissionRecord> commissionRecords = new ArrayList<>();
+// CommissionRecord commissionRecord;
+// for (OrderItem item : orderItems) {
+// commissionRecord = new CommissionRecord();
+// commissionRecord.setSn(item.getSn());
+// BigDecimal commission = item.getCommission();
+// commissionRecord.setCommission(commission);
+// commissionRecord.setCommissionPrice();
+//
+// }
//鍙戦�佽鍗曞凡浠樻娑堟伅
OrderMessage orderMessage = new OrderMessage();
orderMessage.setOrderSn(order.getSn());
@@ -1261,7 +1463,7 @@
// 鍒涘缓琛ㄥご
Row header = sheet.createRow(0);
String[] headers = {"涓昏鍗曠紪鍙�", "瀛愯鍗曠紪鍙�", "閫夎喘鍟嗗搧", "鍟嗗搧鏁伴噺", "鍟嗗搧ID", "鍟嗗搧鍗曚环", "璁㈠崟搴斾粯閲戦",
- "杩愯垂", "浼樻儬鎬婚噾棰�", "骞冲彴浼樻儬", "鍟嗗浼樻儬", "鍟嗗鏀逛环", "鏀粯鏂瑰紡", "鏀朵欢浜�", "鏀朵欢浜烘墜鏈哄彿",
+ "杩愯垂", "浼樻儬鎬婚噾棰�", "骞冲彴浼樻儬", "鍟嗗浼樻儬", "鍟嗗鏀逛环", "鏀粯鏂瑰紡","涔板鍚嶇О", "鏀朵欢浜�", "鏀朵欢浜烘墜鏈哄彿",
"鐪�", "甯�", "鍖�", "琛楅亾", "璇︾粏鍦板潃", "涔板鐣欒█", "璁㈠崟鎻愪氦鏃堕棿", "鏀粯瀹屾垚鏃堕棿", "鏉ユ簮",
"璁㈠崟鐘舵��", "璁㈠崟绫诲瀷", "鍞悗鐘舵��", "鍙栨秷鍘熷洜", "鍙戣揣鏃堕棿", "瀹屾垚鏃堕棿", "搴楅摵"};
@@ -1286,24 +1488,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