From 459ea16b232c1be8721990d3ecaa73cc35f34cbe Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期三, 15 一月 2025 14:30:26 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 31 +++++++++++++++++--------------
1 files changed, 17 insertions(+), 14 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 8b042a8..1fd2ef1 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
@@ -30,6 +30,7 @@
import com.ruoyi.order.util.payment.model.RefundCallbackResult;
import com.ruoyi.order.util.payment.model.RefundResult;
import com.ruoyi.order.util.vo.MapTrackKD100Vo;
+import com.ruoyi.order.util.vo.QueryKD100ListVo;
import com.ruoyi.order.util.vo.QueryKD100Vo;
import com.ruoyi.order.vo.*;
import com.ruoyi.other.api.domain.*;
@@ -201,6 +202,12 @@
orderDetailVO.setLongitude(shop.getLongitude());
orderDetailVO.setLatitude(shop.getLatitude());
orderDetailVO.setShopId(shop.getId());
+ if(StringUtils.isNotEmpty(order.getExpressResult())){
+ MapTrackKD100Vo mapTrackKD100Vo = JSON.parseObject(order.getExpressResult(), MapTrackKD100Vo.class);
+ List<QueryKD100ListVo> data = mapTrackKD100Vo.getData();
+ orderDetailVO.setExpress(data.size() > 0 ? data.get(0).getContext() : "");
+ }
+
if(order.getOrderType() == 1){
List<TechnicianSubscribe> data = technicianSubscribeClient.getTechnicianSubscribeList(order.getId()).getData();
if(data.size() > 0){
@@ -251,12 +258,12 @@
@Override
@Transactional(rollbackFor = Exception.class)
- public void writeOff(String id,Integer shopId, Integer technicianId) {
+ public void writeOff(String id, Integer shopId, String technicianId) {
LoginUser loginUserApplet = tokenService.getLoginUserApplet();
Order order = orderMapper.selectById(id);
boolean check = check(order, shopId, loginUserApplet.getUserid());
if (!check){
- throw new ServiceException("订单不存在");
+ throw new ServiceException("该订单与当前扫码门店不一致");
}
// 售后设置
@@ -276,7 +283,9 @@
order.setAfterSaleTime(LocalDateTime.now().plusDays(days));
order.setEndTime(LocalDateTime.now());
order.setCancellerAppUserId(loginUserApplet.getUserid());
- order.setTechnicianId(technicianId);
+ if(StringUtils.isNotEmpty(technicianId) && !"null".equals(technicianId)){
+ order.setTechnicianId(Integer.valueOf(technicianId));
+ }
orderMapper.updateById(order);
}
@@ -332,17 +341,10 @@
RefundPass one = refundPassService.lambdaQuery().eq(RefundPass::getOrderId, orderPageListVo.getId()).one();
orderPageListVo.setRefundPassId(null != one ? one.getId().toString() : null);
- List<OrderGood> orderGoods = orderGoodMapper.selectList(new LambdaQueryWrapper<OrderGood>()
- .eq(OrderGood::getOrderId, orderPageListVo.getId()));
- BigDecimal servuceShopCharges = BigDecimal.ZERO;
- BigDecimal boundShopCharges = BigDecimal.ZERO;
- for (OrderGood orderGood : orderGoods) {
- if(orderPageListVo.getShopId().equals(orderPageList.getShopId())){
- servuceShopCharges = servuceShopCharges.add(orderGood.getServuceShopCharges());
- }
- boundShopCharges = boundShopCharges.add(orderGood.getBoundShopCharges());
- }
- orderPageListVo.setGetCommission(servuceShopCharges.add(boundShopCharges));
+ // 平台分佣
+ List<ShopBalanceStatement> data = shopBalanceStatementClient.getShopBalanceStatementList(Arrays.asList(1, 2, 3), Long.valueOf(orderPageListVo.getId())).getData();
+ BigDecimal reduce = data.stream().map(ShopBalanceStatement::getVariableAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ orderPageListVo.setGetCommission(reduce);
}
return pageInfo.setRecords(list);
}
@@ -603,6 +605,7 @@
userPoint.setAppUserId(order.getAppUserId());
userPoint.setObjectId(order.getId());
userPointClient.saveUserPoint(userPoint);
+ appUserClient.editAppUserById(appUser);
}
order.setRefundStatus(2);
--
Gitblit v1.7.1