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 { "", // "(status is null or status='1')", "and detail_y.jwcode=#{jwcode}", - "and update_type=#{updateType}", + "and update_type in (#{updateType})", + "and update_type in (#{updateTypes})", "AND detail_y.create_time BETWEEN #{startDate} AND #{endDate}", "and consume_platform=#{consumePlatform}", "and area=#{area}",