From 1460d1f7de102621ad69e221eeefc101a1a2e0ff Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 15 一月 2025 14:31:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java | 3 +++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java | 7 +++++++
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java | 3 +++
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java | 15 +++++++++++++++
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java | 6 ++++++
5 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java
index 93c4562..f5a1336 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/RefundPass.java
@@ -98,4 +98,7 @@
@ApiModelProperty(value = "第三方快递结果")
@TableField("express_result")
private String expressResult;
+
+ @ApiModelProperty("最新快递信息")
+ private String express;
}
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java
index ad189f8..764513a 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java
@@ -91,5 +91,8 @@
@ApiModelProperty("核销码BASE64")
private String writeOffCode;
+
+ @ApiModelProperty("最新快递信息")
+ private String express;
}
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java
index 827270a..733f559 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserSignRecordController.java
@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.account.api.model.AppUser;
+import com.ruoyi.account.api.model.BalanceChangeRecord;
import com.ruoyi.account.api.model.UserPoint;
import com.ruoyi.account.api.model.UserSignRecord;
import com.ruoyi.account.dto.SignBackRDto;
import com.ruoyi.account.service.AppUserService;
+import com.ruoyi.account.service.BalanceChangeRecordService;
import com.ruoyi.account.service.UserPointService;
import com.ruoyi.account.service.UserSignRecordService;
import com.ruoyi.common.core.domain.R;
@@ -52,6 +54,8 @@
@Resource
private UserPointService userPointService;
+ @Resource
+ private BalanceChangeRecordService balanceChangeRecordService;
@@ -116,6 +120,17 @@
BigDecimal sum2 = appUser.getBalance().add(bigDecimalR.getData());
appUser.setBalance(sum2);
appUserService.updateById(appUser);
+ // 增加一条余额明细
+ BalanceChangeRecord balanceChangeRecord = new BalanceChangeRecord();
+ balanceChangeRecord.setAppUserId(appUser.getId());
+ balanceChangeRecord.setVipId(appUser.getVipId());
+ balanceChangeRecord.setChangeType(3);
+ balanceChangeRecord.setBeforeAmount(appUser.getBalance());
+ balanceChangeRecord.setChangeAmount(bigDecimalR.getData());
+ balanceChangeRecord.setAfterAmount(appUser.getBalance().add(bigDecimalR.getData()));
+ balanceChangeRecord.setDelFlag(0);
+ balanceChangeRecord.setCreateTime(LocalDateTime.now());
+ balanceChangeRecordService.save(balanceChangeRecord);
SignBackRDto signBackRDto = new SignBackRDto();
signBackRDto.setPoint(userSignRecord.getPoint());
signBackRDto.setRedAmount(userSignRecord.getRedAmount());
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
index 1db9963..7078489 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/RefundPassController.java
@@ -17,6 +17,7 @@
import com.ruoyi.order.service.RefundPassService;
import com.ruoyi.order.util.ExpressDeliveryUtil;
import com.ruoyi.order.util.vo.MapTrackKD100Vo;
+import com.ruoyi.order.util.vo.QueryKD100ListVo;
import com.ruoyi.order.vo.*;
import com.ruoyi.other.api.domain.SystemConfig;
import com.ruoyi.other.api.feignClient.SystemConfigClient;
@@ -88,6 +89,11 @@
}
one.setIdStr(one.getId().toString());
one.setAddressJson(order.getAddressJson());
+ if(StringUtils.isNotEmpty(one.getExpressResult())){
+ MapTrackKD100Vo mapTrackKD100Vo = JSON.parseObject(one.getExpressResult(), MapTrackKD100Vo.class);
+ List<QueryKD100ListVo> data = mapTrackKD100Vo.getData();
+ one.setExpress(data.size() > 0 ? data.get(0).getContext() : "");
+ }
return R.ok(one);
}
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 7912c6c..38932d5 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){
--
Gitblit v1.7.1