From 3de79cb08809a47a91d354331ab166ab7cc87dc6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 13 一月 2025 11:02:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 215 +++++++++++++++++++++++++++--------------------------
1 files changed, 111 insertions(+), 104 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
index 35d4d3e..51132ee 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java
@@ -22,10 +22,7 @@
import com.ruoyi.order.model.OrderBalancePayment;
import com.ruoyi.order.model.OrderGood;
import com.ruoyi.order.model.RefundPass;
-import com.ruoyi.order.service.CommissionService;
-import com.ruoyi.order.service.OrderBalancePaymentService;
-import com.ruoyi.order.service.OrderService;
-import com.ruoyi.order.service.RefundPassService;
+import com.ruoyi.order.service.*;
import com.ruoyi.order.util.ExpressDeliveryUtil;
import com.ruoyi.order.util.payment.PaymentUtil;
import com.ruoyi.order.util.payment.model.RefundCallbackResult;
@@ -98,6 +95,13 @@
@Resource
private RefundPassService refundPassService;
+ @Resource
+ private TechnicianSubscribeClient technicianSubscribeClient;
+ @Resource
+ private ShopBalanceStatementClient shopBalanceStatementClient;
+
+ @Resource
+ private OrderGoodService orderGoodService;
@@ -135,7 +139,8 @@
orderGoodsVO.setGoodsName(goods.getName());
orderGoodsVO.setType(goods.getType());
orderGoodsVO.setGoodsPic(goods.getHomePagePicture());
- orderGoodsVO.setSellingPrice(goods.getSellingPrice());
+ orderGoodsVO.setSellingPrice(orderGood.getSellingPrice());
+ orderGoodsVO.setIntegral(orderGood.getIntegral());
orderGoodsVO.setOriginalPrice(goods.getOriginalPrice());
goodsList.add(orderGoodsVO);
}
@@ -231,10 +236,9 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void writeOff(String code,Integer shopId) {
+ public void writeOff(String id,Integer shopId) {
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
- Order order = orderMapper.selectOne(new LambdaQueryWrapper<Order>()
- .eq(Order::getId, code));
+ Order order = orderMapper.selectById(id);
boolean check = check(order, shopId, loginUserApplet.getUserid());
if (!check){
throw new ServiceException("订单不存在");
@@ -256,6 +260,7 @@
order.setIsCommission(0);
order.setAfterSaleTime(LocalDateTime.now().plusDays(days));
order.setEndTime(LocalDateTime.now());
+ order.setCancellerAppUserId(loginUserApplet.getUserid());
orderMapper.updateById(order);
}
@@ -303,8 +308,10 @@
for (OrderPageListVo orderPageListVo : list) {
Long appUserId = orderPageListVo.getAppUserId();
AppUser appUser = appUserClient.getAppUserById(appUserId);
- orderPageListVo.setUserName(appUser.getName());
- orderPageListVo.setPhone(appUser.getPhone());
+ if(null != appUser){
+ orderPageListVo.setUserName(appUser.getName());
+ orderPageListVo.setPhone(appUser.getPhone());
+ }
RefundPass one = refundPassService.getOne(new LambdaQueryWrapper<RefundPass>().eq(RefundPass::getOrderId, orderPageListVo.getId()).eq(RefundPass::getDelFlag, 0).last(" order by create_time desc limit 0, 1"));
orderPageListVo.setRefundPassId(null != one ? one.getId().toString() : null);
}
@@ -330,7 +337,7 @@
if(!Arrays.asList(1, 2, 3).contains(order.getOrderStatus())){
return R.fail("订单取消失败");
}
- if(LocalDateTime.now().isAfter(order.getAfterSaleTime())){
+ if(null != order.getAfterSaleTime() && LocalDateTime.now().isAfter(order.getAfterSaleTime())){
return R.fail("订单取消失败");
}
order.setOrderStatus(5);
@@ -438,6 +445,45 @@
balanceChangeRecord.setDelFlag(0);
balanceChangeRecord.setCreateTime(LocalDateTime.now());
balanceChangeRecordClient.saveBalanceChangeRecord(balanceChangeRecord);
+
+ //退回获得的消费积分
+ //需要先检查会员等级时候回回退，使用回退后的会员等级查询配置
+ Integer lavePoint = appUser.getLavePoint();
+
+ UserPoint userPoint1 = new UserPoint();
+ userPoint1.setType(1);
+ userPoint1.setAppUserId(appUser.getId());
+ userPoint1.setObjectId(order.getId());
+ UserPoint userPoint2 = userPointClient.getUserPointList(userPoint1).getData().get(0);
+ JSONObject jsonObject = JSON.parseObject(userPoint2.getExtention());
+ Integer shopPoint = jsonObject.getInteger("shopPoint");
+ Integer availablePoint = jsonObject.getInteger("availablePoint");
+ Integer transferablePoint = jsonObject.getInteger("transferablePoint");
+ appUser.setShopPoint(appUser.getShopPoint() - shopPoint);
+ appUser.setLavePoint(appUser.getLavePoint() - shopPoint);
+ appUser.setAvailablePoint(appUser.getAvailablePoint() - availablePoint);
+ appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() - availablePoint);
+ if(null != transferablePoint){
+ appUser.setTransferablePoint(appUser.getTransferablePoint() - transferablePoint);
+ }
+ appUser.setTotalPoint(appUser.getTotalPoint() - shopPoint);
+
+ boolean vipDemotion = vipDemotion(appUser.getShopPoint(), appUser.getVipId());
+ if(vipDemotion){
+ appUser.setVipId(appUser.getVipId() - 1);
+ }
+
+ //构建积分流水明细
+ UserPoint userPoint = new UserPoint();
+ userPoint.setType(1);
+ userPoint.setHistoricalPoint(lavePoint);
+ userPoint.setVariablePoint(shopPoint);
+ userPoint.setBalance(appUser.getLavePoint());
+ userPoint.setCreateTime(LocalDateTime.now());
+ userPoint.setAppUserId(order.getAppUserId());
+ userPoint.setObjectId(order.getId());
+ userPointClient.saveUserPoint(userPoint);
+ appUserClient.editAppUserById(appUser);
}
if(3 == payMethod){
//开始运费退款，积分支付，运费是单独进行支付的，所以需要单独退款
@@ -457,8 +503,10 @@
//余额退款
OrderBalancePayment orderBalancePayment = orderBalancePaymentService.getOne(new LambdaQueryWrapper<OrderBalancePayment>().eq(OrderBalancePayment::getOrderId, order.getId()));
BigDecimal balance = appUser.getBalance();
- appUser.setTotalRedPacketAmount(appUser.getTotalRedPacketAmount().add(orderBalancePayment.getRedPacketAmount()).setScale(2, RoundingMode.HALF_EVEN));
- appUser.setTotalDistributionAmount(appUser.getTotalDistributionAmount().add(orderBalancePayment.getDistributionAmount()).setScale(2, RoundingMode.HALF_EVEN));
+ if(null != orderBalancePayment){
+ appUser.setTotalRedPacketAmount(appUser.getTotalRedPacketAmount().add(orderBalancePayment.getRedPacketAmount()).setScale(2, RoundingMode.HALF_EVEN));
+ appUser.setTotalDistributionAmount(appUser.getTotalDistributionAmount().add(orderBalancePayment.getDistributionAmount()).setScale(2, RoundingMode.HALF_EVEN));
+ }
appUser.setBalance(balance.add(expressAmount).setScale(2, RoundingMode.HALF_EVEN));
//构建账户余额流水明细
BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
@@ -500,39 +548,6 @@
userPoint.setObjectId(order.getId());
userPointClient.saveUserPoint(userPoint);
}
- //退回获得的消费积分
- //需要先检查会员等级时候回回退，使用回退后的会员等级查询配置
- Integer lavePoint = appUser.getLavePoint();
- Integer getPoint = order.getGetPoint();
- boolean vipDemotion = vipDemotion(appUser.getShopPoint() - getPoint, appUser.getVipId());
- PointSetting pointSetting = pointSettingClient.getPointSetting(vipDemotion ? appUser.getVipId() - 1 : appUser.getVipId()).getData();
- int earnPoint1 = 0;
- if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
- earnPoint1 = new BigDecimal(getPoint).divide(pointSetting.getBuyPoint().divide(new BigDecimal(100))).intValue();
- }
- appUser.setShopPoint(appUser.getShopPoint() - getPoint);
- appUser.setLavePoint(appUser.getLavePoint() - getPoint);
- appUser.setAvailablePoint(appUser.getAvailablePoint() - earnPoint1);
- appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() - earnPoint1);
- if(null != pointSetting && 1 == pointSetting.getBuyPointGift()){
- appUser.setTransferablePoint(appUser.getTransferablePoint() - earnPoint1);
- }
- appUser.setTotalPoint(appUser.getTotalPoint() - getPoint);
- if(vipDemotion){
- appUser.setVipId(appUser.getVipId() - 1);
- }
-
- //构建积分流水明细
- UserPoint userPoint = new UserPoint();
- userPoint.setType(1);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(getPoint);
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(order.getAppUserId());
- userPoint.setObjectId(order.getId());
- userPointClient.saveUserPoint(userPoint);
- appUserClient.editAppUserById(appUser);
order.setRefundStatus(2);
order.setRefundTime(LocalDateTime.now());
@@ -555,26 +570,29 @@
order.setRefundStatus(2);
order.setRefundTime(LocalDateTime.now());
this.updateById(order);
-
//退回获得的消费积分
//需要先检查会员等级时候回回退，使用回退后的会员等级查询配置
AppUser appUser = appUserClient.getAppUserById(order.getAppUserId());
Integer lavePoint = appUser.getLavePoint();
- Integer getPoint = order.getGetPoint();
- boolean vipDemotion = vipDemotion(appUser.getShopPoint() - getPoint, appUser.getVipId());
- PointSetting pointSetting = pointSettingClient.getPointSetting(vipDemotion ? appUser.getVipId() - 1 : appUser.getVipId()).getData();
- int earnPoint1 = 0;
- if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
- earnPoint1 = new BigDecimal(getPoint).divide(pointSetting.getBuyPoint().divide(new BigDecimal(100))).intValue();
+ UserPoint userPoint1 = new UserPoint();
+ userPoint1.setType(1);
+ userPoint1.setAppUserId(appUser.getId());
+ userPoint1.setObjectId(order.getId());
+ UserPoint userPoint2 = userPointClient.getUserPointList(userPoint1).getData().get(0);
+ JSONObject jsonObject = JSON.parseObject(userPoint2.getExtention());
+ Integer shopPoint = jsonObject.getInteger("shopPoint");
+ Integer availablePoint = jsonObject.getInteger("availablePoint");
+ Integer transferablePoint = jsonObject.getInteger("transferablePoint");
+ appUser.setShopPoint(appUser.getShopPoint() - shopPoint);
+ appUser.setLavePoint(appUser.getLavePoint() - shopPoint);
+ appUser.setAvailablePoint(appUser.getAvailablePoint() - availablePoint);
+ appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() - availablePoint);
+ if(null != transferablePoint){
+ appUser.setTransferablePoint(appUser.getTransferablePoint() - transferablePoint);
}
- appUser.setShopPoint(appUser.getShopPoint() - getPoint);
- appUser.setLavePoint(appUser.getLavePoint() - getPoint);
- appUser.setAvailablePoint(appUser.getAvailablePoint() - earnPoint1);
- appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() - earnPoint1);
- if(null != pointSetting && 1 == pointSetting.getBuyPointGift()){
- appUser.setTransferablePoint(appUser.getTransferablePoint() - earnPoint1);
- }
- appUser.setTotalPoint(appUser.getTotalPoint() - getPoint);
+ appUser.setTotalPoint(appUser.getTotalPoint() - shopPoint);
+
+ boolean vipDemotion = vipDemotion(appUser.getShopPoint(), appUser.getVipId());
if(vipDemotion){
appUser.setVipId(appUser.getVipId() - 1);
}
@@ -583,7 +601,7 @@
UserPoint userPoint = new UserPoint();
userPoint.setType(1);
userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(getPoint);
+ userPoint.setVariablePoint(shopPoint);
userPoint.setBalance(appUser.getLavePoint());
userPoint.setCreateTime(LocalDateTime.now());
userPoint.setAppUserId(order.getAppUserId());
@@ -636,44 +654,7 @@
userPoint.setAppUserId(order.getAppUserId());
userPoint.setObjectId(order.getId());
userPointClient.saveUserPoint(userPoint);
-
- //退回获得的消费积分
- //需要先检查会员等级时候回回退，使用回退后的会员等级查询配置
- lavePoint = appUser.getLavePoint();
- Integer getPoint = order.getGetPoint();
- boolean vipDemotion = vipDemotion(appUser.getShopPoint() - getPoint, appUser.getVipId());
- PointSetting pointSetting = pointSettingClient.getPointSetting(vipDemotion ? appUser.getVipId() - 1 : appUser.getVipId()).getData();
- int earnPoint1 = 0;
- if(null != pointSetting && 1 == pointSetting.getBuyPointOpen()){
- earnPoint1 = new BigDecimal(getPoint).divide(pointSetting.getBuyPoint().divide(new BigDecimal(100))).intValue();
- }
- appUser.setShopPoint(appUser.getShopPoint() - getPoint);
- appUser.setLavePoint(appUser.getLavePoint() - getPoint);
- appUser.setAvailablePoint(appUser.getAvailablePoint() - earnPoint1);
- appUser.setTotalAvailablePoint(appUser.getTotalAvailablePoint() - earnPoint1);
- if(null != pointSetting && 1 == pointSetting.getBuyPointGift()){
- appUser.setTransferablePoint(appUser.getTransferablePoint() - earnPoint1);
- }
- appUser.setTotalPoint(appUser.getTotalPoint() - getPoint);
- if(vipDemotion){
- appUser.setVipId(appUser.getVipId() - 1);
- }
-
- //构建积分流水明细
- userPoint = new UserPoint();
- userPoint.setType(1);
- userPoint.setHistoricalPoint(lavePoint);
- userPoint.setVariablePoint(getPoint);
- userPoint.setBalance(appUser.getLavePoint());
- userPoint.setCreateTime(LocalDateTime.now());
- userPoint.setAppUserId(order.getAppUserId());
- userPoint.setObjectId(order.getId());
- userPointClient.saveUserPoint(userPoint);
- appUserClient.editAppUserById(appUser);
-
- order.setRefundStatus(2);
- order.setRefundTime(LocalDateTime.now());
- return null;
+ return R.ok();
}
/**
@@ -733,9 +714,11 @@
orderInfo.setOrderStatus(order.getOrderStatus());
orderInfo.setCreateTime(order.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
AppUser appUser = appUserClient.getAppUserById(order.getAppUserId());
- orderInfo.setUserName(appUser.getName());
- orderInfo.setPhone(appUser.getPhone());
- orderInfo.setOrderType(order.getOrderType() == 1 ? "服务" : (StringUtils.isNotEmpty(order.getExpressJson()) ? "单品-快递配送" : "单品-自提"));
+ if(null != appUser){
+ orderInfo.setUserName(appUser.getName());
+ orderInfo.setPhone(appUser.getPhone());
+ }
+ orderInfo.setOrderType(order.getOrderType() == 1 ? "服务" : (StringUtils.isNotEmpty(order.getAddressJson()) ? "单品-快递配送" : "单品-上门自提"));
Shop shop = shopClient.getShopById(order.getShopId()).getData();
if(null != shop){
orderInfo.setShopName(shop.getName());
@@ -749,7 +732,7 @@
orderInfo.setDiscountAmount(order.getDiscountTotalAmount());
orderInfo.setExpressAmount(order.getExpressAmount());
orderInfo.setPaymentAmount(order.getPaymentAmount());
- orderInfo.setPoint(order.getGetPoint());
+ orderInfo.setGetPoint(order.getGetPoint());
if(StringUtils.isNotEmpty(order.getAddressJson())){
UserAddress userAddress = JSON.parseObject(order.getAddressJson(), UserAddress.class);
orderInfo.setRecipient(userAddress.getRecieveName() + "-" + userAddress.getRecievePhone());
@@ -775,6 +758,30 @@
goodsJson.add(map);
}
orderInfo.setGoodsJson(JSON.toJSONString(goodsJson));
+ orderInfo.setPoint(order.getPoint());
+ if(null != order.getAfterSaleTime()){
+ orderInfo.setAfterSaleTime(order.getAfterSaleTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ }
+ if(StringUtils.isNotEmpty(order.getActivityJson())){
+ OrderActivityInfo activityInfo = JSON.parseObject(order.getActivityJson(), OrderActivityInfo.class);
+ orderInfo.setActivityName(activityInfo.getActivityName());
+ }
+ if(null != order.getEndTime()){
+ AppUser user = appUserClient.getAppUserById(order.getCancellerAppUserId());
+ orderInfo.setCanceller(user.getName());
+ orderInfo.setWriteOffTime(order.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+ }
+ if(order.getOrderType() == 1){
+ List<TechnicianSubscribe> technicianSubscribes = technicianSubscribeClient.getTechnicianSubscribeList(order.getId()).getData();
+ if(technicianSubscribes.size() > 0){
+ Set<Integer> collect = technicianSubscribes.stream().map(TechnicianSubscribe::getTechnicianId).collect(Collectors.toSet());
+ List<Technician> data = technicianClient.getTechnicianByIds(collect).getData();
+ orderInfo.setTechnicianName(data.stream().map(Technician::getName).collect(Collectors.joining(",")));
+ }
+ }
+ List<ShopBalanceStatement> data = shopBalanceStatementClient.getShopBalanceStatementList(Arrays.asList(1, 2, 3), order.getId()).getData();
+ BigDecimal reduce = data.stream().map(ShopBalanceStatement::getVariableAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ orderInfo.setSubcommission(reduce);
return orderInfo;
}
--
Gitblit v1.7.1