From 0e97ce7b31e4de409b4281bd9bc13da70e1bc1d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B8=85=E6=99=A8?= <136767481@qq.com>
Date: Sat, 2 Aug 2025 15:05:25 +0800
Subject: [PATCH] =?UTF-8?q?feat(work):=20=E6=96=B0=E5=A2=9E=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD=E5=B9=B6=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=8A=B5=E6=89=A3=E9=87=91=E5=92=8C=E9=9B=86=E6=9D=90?=
 =?UTF-8?q?=E7=A4=BE=E8=AE=A2=E5=8D=95ID=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 ITpOrderService 接口中新增 updateInfoByBo 方法用于修改订单信息
- 在 TpOrder、TpOrderBo、TpOrderVo 类中添加 coupon（抵扣金）和 jcOrderId（集材社订单ID）字段
- 更新 TpOrderServiceImpl 中的订单修改逻辑，考虑抵扣金因素
---
 .../java/org/dromara/work/domain/TpOrder.java | 10 ++++++++++
 .../org/dromara/work/domain/bo/TpOrderBo.java | 10 ++++++++++
 .../org/dromara/work/domain/vo/TpOrderVo.java | 10 ++++++++++
 .../dromara/work/service/ITpOrderService.java |  7 +++++++
 .../work/service/impl/TpOrderServiceImpl.java | 20 +++++++++++++++----
 5 files changed, 53 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/TpOrder.java b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/TpOrder.java
index e95c4c0..5aed123 100644
--- a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/TpOrder.java
+++ b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/TpOrder.java
@@ -235,6 +235,16 @@ public class TpOrder {
      */
     private String byThree;
 
+    /**
+     * 抵扣金
+     */
+    private BigDecimal coupon;
+
+    /**
+     * 集材社订单ID
+     */
+    private Long jcOrderId;
+
     /**
      * 接待客服名称
      */
diff --git a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/bo/TpOrderBo.java b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/bo/TpOrderBo.java
index c84ec91..57a4544 100644
--- a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/bo/TpOrderBo.java
+++ b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/bo/TpOrderBo.java
@@ -316,4 +316,14 @@ public class TpOrderBo extends BaseEntity {
      */
     private String byThree;
 
+    /**
+     * 抵扣金
+     */
+    private BigDecimal coupon;
+
+    /**
+     * 集材社订单ID
+     */
+    private Long jcOrderId;
+
 }
diff --git a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/vo/TpOrderVo.java b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/vo/TpOrderVo.java
index a74263d..b0ae4a7 100644
--- a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/vo/TpOrderVo.java
+++ b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/domain/vo/TpOrderVo.java
@@ -322,4 +322,14 @@ public class TpOrderVo implements Serializable {
      */
     private String byThree;
 
+    /**
+     * 抵扣金
+     */
+    private BigDecimal coupon;
+
+    /**
+     * 集材社订单ID
+     */
+    private Long jcOrderId;
+
 }
diff --git a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/ITpOrderService.java b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/ITpOrderService.java
index bf0fa7b..947dff1 100644
--- a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/ITpOrderService.java
+++ b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/ITpOrderService.java
@@ -199,4 +199,11 @@ public interface ITpOrderService extends MPJBaseService<TpOrder> {
      * @return
      */
     List<TpOrderVo> queryList(TpOrderBo bo);
+
+    /**
+     * 修改订单信息
+     * @param bo
+     * @return
+     */
+    Boolean updateInfoByBo(TpOrderBo bo);
 }
diff --git a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/impl/TpOrderServiceImpl.java b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/impl/TpOrderServiceImpl.java
index 3273c89..7875fdb 100644
--- a/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/impl/TpOrderServiceImpl.java
+++ b/ruoyi-modules/ruoyi-work/src/main/java/org/dromara/work/service/impl/TpOrderServiceImpl.java
@@ -576,17 +576,17 @@ public class TpOrderServiceImpl extends MPJBaseServiceImpl<TpOrderMapper,TpOrder
         if(StringUtils.isNotEmpty(bo.getOrderId()) && !Objects.equals(bo.getOrderId(), order.getOrderId())){
             throw new ServiceException("订单编号不可以修改");
         }
-        BigDecimal endPrice = bo.getPrice().subtract(order.getPayPrice());
+        BigDecimal endPrice = bo.getPrice().subtract(order.getPayPrice().add(order.getCoupon()));
         if(endPrice.compareTo(BigDecimal.ZERO) < 0){
             throw new ServiceException("订单金额不可以小于已支付金额");
         }
         if(order.getPayState() == 2){
-            if (bo.getPrice().compareTo(order.getPayPrice()) == 0) {
+            if (bo.getPrice().compareTo(order.getPayPrice().add(order.getCoupon())) == 0) {
                 bo.setPayState(3);
             }
         }
         if(order.getPayState() == 3){
-            if(bo.getPrice().compareTo(order.getPayPrice()) > 0){
+            if(bo.getPrice().compareTo(order.getPayPrice().add(order.getCoupon())) > 0){
                 bo.setPayState(2);
             }
         }
@@ -600,6 +600,18 @@ public class TpOrderServiceImpl extends MPJBaseServiceImpl<TpOrderMapper,TpOrder
         return baseMapper.updateById(update) > 0;
     }
 
+    /**
+     * 修改订单信息
+     *
+     * @param bo
+     * @return
+     */
+    @Override
+    public Boolean updateInfoByBo(TpOrderBo bo) {
+        TpOrder update = MapstructUtils.convert(bo, TpOrder.class);
+        return baseMapper.updateById(update) > 0;
+    }
+
     /**
      * 校验并批量删除订单管理信息
      *
@@ -779,7 +791,7 @@ public class TpOrderServiceImpl extends MPJBaseServiceImpl<TpOrderMapper,TpOrder
         order.setJsPayPrice(getJsPay(jsPayPrice));
         order.setState(2);
         order.setPayPrice(newPayPrice);
-        BigDecimal endPrice = order.getPrice().subtract(newPayPrice);
+        BigDecimal endPrice = order.getPrice().subtract(newPayPrice.add(order.getCoupon()));
         order.setEndPrice(endPrice);
         if(endPrice.compareTo(BigDecimal.ZERO) > 0){
             order.setPayState(2);