From 214bdfa204df892f4c2762480bc128b14ae4754b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Sun, 24 Aug 2025 20:32:03 +0800
Subject: [PATCH] =?UTF-8?q?feat(cms/pwl/shop):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=85=B3=E9=94=AE=E8=AF=8D=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 CmsWebsiteFieldMapper.xml 中添加关键词搜索条件，支持对 comments、value 和 name 字段进行模糊搜索
- 在 PwlProjectMapper.xml 中移除对 item_year 字段的关键词搜索条件- 在 ShopOrderController 中，为订单状态为 4（申请退款）的订单自动设置退款申请时间
---
 .../com/gxwebsoft/cms/mapper/xml/CmsWebsiteFieldMapper.xml  | 6 ++++++
 .../java/com/gxwebsoft/pwl/mapper/xml/PwlProjectMapper.xml  | 1 -
 .../com/gxwebsoft/shop/controller/ShopOrderController.java  | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsWebsiteFieldMapper.xml b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsWebsiteFieldMapper.xml
index 529b688..dc903bc 100644
--- a/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsWebsiteFieldMapper.xml
+++ b/src/main/java/com/gxwebsoft/cms/mapper/xml/CmsWebsiteFieldMapper.xml
@@ -53,6 +53,12 @@
             <if test="param.createTimeEnd != null">
                 AND a.create_time &lt;= #{param.createTimeEnd}
             </if>
+            <if test="param.keywords != null">
+              AND (a.comments  LIKE CONCAT('%', #{param.keywords}, '%')
+              OR a.value LIKE CONCAT('%', #{param.keywords}, '%')
+              OR a.name LIKE CONCAT('%', #{param.keywords}, '%')
+              )
+            </if>
         </where>
     </sql>
 
diff --git a/src/main/java/com/gxwebsoft/pwl/mapper/xml/PwlProjectMapper.xml b/src/main/java/com/gxwebsoft/pwl/mapper/xml/PwlProjectMapper.xml
index b5827d0..57eafd4 100644
--- a/src/main/java/com/gxwebsoft/pwl/mapper/xml/PwlProjectMapper.xml
+++ b/src/main/java/com/gxwebsoft/pwl/mapper/xml/PwlProjectMapper.xml
@@ -138,7 +138,6 @@
               AND (a.name LIKE CONCAT('%', #{param.keywords}, '%')
               OR a.id = #{param.keywords}
               OR a.code = #{param.keywords}
-              OR a.item_year = #{param.keywords}
               )
             </if>
         </where>
diff --git a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java
index 19f04b6..436f63e 100644
--- a/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java
+++ b/src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java
@@ -163,6 +163,10 @@ public class ShopOrderController extends BaseController {
   @Operation(summary = "修改订单")
   @PutMapping()
   public ApiResult<?> update(@RequestBody ShopOrder shopOrder) {
+    // 申请退款
+    if(shopOrder.getOrderStatus().equals(4)){
+      shopOrder.setRefundApplyTime(LocalDateTime.now());
+    }
     if (shopOrderService.updateById(shopOrder)) {
       return success("修改成功");
     }