From 4789c477d37c34b3ada210a15bdb012e500210b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B8=85=E6=99=A8?= <136767481@qq.com>
Date: Fri, 29 Aug 2025 23:32:57 +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 中的订单修改逻辑，考虑抵扣金因素
---
 .../org/dromara/work/service/impl/TpOrderServiceImpl.java   | 6 ++++++
 1 file changed, 6 insertions(+)

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 9786ccf..e391feb 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
@@ -429,6 +429,9 @@ public class TpOrderServiceImpl extends MPJBaseServiceImpl<TpOrderMapper,TpOrder
             lqw.isNotNull(bo.getAssignState() == 2, TpOrder::getBid);
         }
         lqw.eq(bo.getStyle() != null, TpOrder::getStyle, bo.getStyle());
+        lqw.like(StringUtils.isNotBlank(bo.getByOne()), TpOrder::getByOne, bo.getByOne());
+        lqw.like(StringUtils.isNotBlank(bo.getByTwo()), TpOrder::getByTwo, bo.getByTwo());
+        lqw.like(StringUtils.isNotBlank(bo.getByThree()), TpOrder::getByThree, bo.getByThree());
         lqw.like(StringUtils.isNotBlank(bo.getSpace()), TpOrder::getSpace, bo.getSpace());
         lqw.eq(bo.getQuality() != null, TpOrder::getQuality, bo.getQuality());
         lqw.eq(bo.getType() != null, TpOrder::getType, bo.getType());
@@ -529,6 +532,9 @@ public class TpOrderServiceImpl extends MPJBaseServiceImpl<TpOrderMapper,TpOrder
         }
         lqw.eq(bo.getStyle() != null, TpOrder::getStyle, bo.getStyle());
         lqw.like(StringUtils.isNotBlank(bo.getSpace()), TpOrder::getSpace, bo.getSpace());
+        lqw.like(StringUtils.isNotBlank(bo.getByOne()), TpOrder::getByOne, bo.getByOne());
+        lqw.like(StringUtils.isNotBlank(bo.getByTwo()), TpOrder::getByTwo, bo.getByTwo());
+        lqw.like(StringUtils.isNotBlank(bo.getByThree()), TpOrder::getByThree, bo.getByThree());
         lqw.eq(bo.getQuality() != null, TpOrder::getQuality, bo.getQuality());
         lqw.eq(bo.getType() != null, TpOrder::getType, bo.getType());
         lqw.eq(bo.getState() != null, TpOrder::getState, bo.getState());