diff --git a/src/main/java/com/example/demo/Util/BaseDES.java b/src/main/java/com/example/demo/Util/BaseDES.java index 5b013bf..445abd0 100644 --- a/src/main/java/com/example/demo/Util/BaseDES.java +++ b/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")); diff --git a/src/main/resources/application-test.yml b/src/main/resources/application-test.yml index 30339e7..90ae516 100644 --- a/src/main/resources/application-test.yml +++ b/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: diff --git a/src/main/resources/cashMapper/CashRefundMapper.xml b/src/main/resources/cashMapper/CashRefundMapper.xml index 8a74118..98c62e0 100644 --- a/src/main/resources/cashMapper/CashRefundMapper.xml +++ b/src/main/resources/cashMapper/CashRefundMapper.xml @@ -210,11 +210,12 @@ AND crc.payment_currency LIKE CONCAT('%', #{paymentCurrency}, '%') - - AND crc.goods_name IN - - #{goodsNames} + + AND ( + + crc.goods_name LIKE CONCAT('%', #{name}, '%') + ) and crc.pay_type = #{payType} @@ -295,7 +296,7 @@ - and crc.goods_name = #{goodsName} + and crc.goods_name like CONCAT('%', #{goodsName}, '%') and crc.pay_type = #{payType} @@ -378,11 +379,12 @@ - - AND crc.goods_name IN - - #{goodsNames} + + AND ( + + crc.goods_name LIKE CONCAT('%', #{name}, '%') + ) AND crr.refund_currency like CONCAT('%', #{refundCurrency}, '%')