修改补交

src/main/java/com/example/demo/Util/BaseDES.java

@@ -91,7 +91,7 @@ public class BaseDES {
 	public static void main(String args[]) {
 		try {
 			BaseDES d = new BaseDES();
-			String encryptedText = d.encrypt("90048169");
+			String encryptedText = d.encrypt("90048384");
 			System.out.println("加密结果：" + encryptedText);
 			System.out.println("加密字符串：90005179》"+d.encrypt("90005179"));
 			System.out.println("解密字符串：6aaef5277c050f7ae383f816651098ff》"+d.decrypt("6aaef5277c050f7ae383f816651098ff"));

src/main/resources/application-test.yml

@@ -81,9 +81,9 @@ spring:
   data:
     redis:
       database: 0
-      host: 54.255.212.181
-      port: 10703
-      password: Ngc0FYUTA6h3wC5J
+      host: localhost
+      port: 6379
+      password: 123456
 
       lettuce:
         pool:

src/main/resources/cashMapper/CashRefundMapper.xml

@@ -210,11 +210,12 @@
             AND crc.payment_currency LIKE CONCAT('%', #{paymentCurrency}, '%')
         </if>
 
-            <if test="goodsNames!= null and goodsNames.size > 0">
-                AND crc.goods_name IN
-                <foreach collection="goodsNames" item="goodsNames" open="(" separator="," close=")">
-                    #{goodsNames}
+            <if test="goodsNames != null and !goodsNames.isEmpty()">
+                AND (
+                <foreach collection="goodsNames" item="name" separator=" OR ">
+                    crc.goods_name LIKE CONCAT('%', #{name}, '%')
                 </foreach>
+                )
             </if>
         <if test="payType != null and payType.length()>0">
             and crc.pay_type = #{payType}
@@ -295,7 +296,7 @@
 <!--                </foreach>-->
 <!--            </if>-->
             <if test="goodsName!= null and goodsName.length() > 0">
-                and crc.goods_name = #{goodsName}
+                and crc.goods_name like CONCAT('%', #{goodsName}, '%')
             </if>
             <if test="payType != null and payType.length()>0">
                 and crc.pay_type = #{payType}
@@ -378,11 +379,12 @@
                 </foreach>
             </if>
 
-            <if test="goodsNames!= null and goodsNames.size > 0">
-                AND crc.goods_name IN
-                <foreach collection="goodsNames" item="goodsNames" open="(" separator="," close=")">
-                    #{goodsNames}
+            <if test="goodsNames != null and !goodsNames.isEmpty()">
+                AND (
+                <foreach collection="goodsNames" item="name" separator=" OR ">
+                    crc.goods_name LIKE CONCAT('%', #{name}, '%')
                 </foreach>
+                )
             </if>
             <if test="refundCurrency != null and refundCurrency.length() > 0">
                 AND crr.refund_currency like CONCAT('%', #{refundCurrency}, '%')