From 0f5afcb2673e4bf63eed7d71e914eac08aba46d7 Mon Sep 17 00:00:00 2001
From: huangqizhen <huangqizhen@legu168.com>
Date: Tue, 11 Mar 2025 15:05:34 +0800
Subject: [PATCH] =?UTF-8?q?3.12=E5=AE=A2=E6=88=B7=E9=87=91=E5=B8=81?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=96=B0=E5=A2=9E=E9=87=91=E5=B8=81=E5=A2=9E?=
 =?UTF-8?q?=E6=B7=BB=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/example/demo/Util/BaseDES.java          | 2 +-
 src/main/java/com/example/demo/domain/entity/DetailY.java | 1 +
 src/main/java/com/example/demo/mapper/DetailYMapper.java  | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/example/demo/Util/BaseDES.java b/src/main/java/com/example/demo/Util/BaseDES.java
index 95523c2..148d412 100644
--- a/src/main/java/com/example/demo/Util/BaseDES.java
+++ b/src/main/java/com/example/demo/Util/BaseDES.java
@@ -93,7 +93,7 @@ public class BaseDES {
 	public static void main(String args[]) {
 		try {
 			BaseDES d = new BaseDES();
-			String encryptedText = d.encrypt("90000909");
+			String encryptedText = d.encrypt("94615273");
 			System.out.println("加密结果：" + encryptedText);
 			System.out.println("加密字符串：90005179》"+d.encrypt("90005179"));
 			System.out.println("解密字符串：6aaef5277c050f7ae383f816651098ff》"+d.decrypt("6aaef5277c050f7ae383f816651098ff"));
diff --git a/src/main/java/com/example/demo/domain/entity/DetailY.java b/src/main/java/com/example/demo/domain/entity/DetailY.java
index ffdc081..4d28055 100644
--- a/src/main/java/com/example/demo/domain/entity/DetailY.java
+++ b/src/main/java/com/example/demo/domain/entity/DetailY.java
@@ -51,6 +51,7 @@ public class DetailY implements Serializable {
     private String orderCode;
     private Integer refundFlag;
 
+    private String updateTypes;
 
     //    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
 //    @DateTimeFormat(pattern = "yyyy-MM-dd")
diff --git a/src/main/java/com/example/demo/mapper/DetailYMapper.java b/src/main/java/com/example/demo/mapper/DetailYMapper.java
index 9555039..d766ac3 100644
--- a/src/main/java/com/example/demo/mapper/DetailYMapper.java
+++ b/src/main/java/com/example/demo/mapper/DetailYMapper.java
@@ -67,7 +67,8 @@ public interface DetailYMapper {
             "<where>",
 //            "(status is null or status='1')",
             "<if test='jwcode!=null and jwcode.length>0'>and detail_y.jwcode=#{jwcode}</if>",
-            "<if test='updateType!=null'>and update_type=#{updateType}</if>",
+            "<if test='updateType!=null'>and update_type in (#{updateType})</if>",
+            "<if test='updateTypes!=null'>and update_type in (#{updateTypes})</if>",
             "<if test='startDate != null and endDate != null'>AND detail_y.create_time BETWEEN #{startDate} AND #{endDate}</if>",
             "<if test='consumePlatform!=null and consumePlatform.length>0'>and consume_platform=#{consumePlatform}</if>",
             "<if test='area!=null and area.length>0'>and area=#{area}</if>",