10.20 修改地区与排序

src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java

@@ -347,10 +347,8 @@ public class MysqlServiceImpl implements MysqlService {
                         Map<String, Object> dataMap = (Map<String, Object>) responseBody.get("data");
                         if (dataMap != null) {
                             name = (String) dataMap.get("name");
-                            Object countryObj = dataMap.get("country");
-                            if (countryObj instanceof List) {
-                                country = (String) countryObj;
-                            }
+                            country = getCountryWithDefault(dataMap, "未知");
+
                             logger.info("获取用户信息成功: name={}, country={}", name, country);
                         }
                     }
@@ -424,5 +422,19 @@ public class MysqlServiceImpl implements MysqlService {
             }
         }
     }
+    private String getCountryWithDefault(Map<String, Object> dataMap, String defaultValue) {
+        Object countryObj = dataMap.get("treelist");
+
+        if (countryObj instanceof String) {
+            String countryStr = ((String) countryObj).trim();
+            if (countryStr.isEmpty()) {
+                return defaultValue;
+            }
 
+            String[] parts = countryStr.split("-");
+            return parts.length >= 3 ? parts[2] : defaultValue;
+        }
+
+        return defaultValue;
+    }
 }

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("90048144");
+			String encryptedText = d.encrypt("90048169");
 			System.out.println("加密结果：" + encryptedText);
 			System.out.println("加密字符串：90005179》"+d.encrypt("90005179"));
 			System.out.println("解密字符串：6aaef5277c050f7ae383f816651098ff》"+d.decrypt("6aaef5277c050f7ae383f816651098ff"));

src/main/java/com/example/demo/domain/vo/cash/CashRecordDone.java

@@ -35,6 +35,7 @@ public class CashRecordDone {
     private String bankCode;
     /** 商品名称 */
     private String goodsName;
+    private List<String> goodsNames;
     /** 币种 */
     private String paymentCurrency;
     /** 金额 */

src/main/java/com/example/demo/mapper/coin/MarketMapper.java

@@ -12,6 +12,6 @@ public interface MarketMapper {
     //获取单个市场id
     String getMarketId(String market);
 
-    Market getMarketIdDao(String  market);
+    Market getMarketIdDao(String  country);
     Market getMarketIdBytype(String  market);
 }

src/main/java/com/example/demo/service/coin/MarketService.java

@@ -18,5 +18,5 @@ public interface MarketService {
     //获取市场id
     List<String> getMarketIds(List<String> list);
     //dao获取市场id
-    String getMarketIdsDao(String market);
+    String getMarketIdsDao(String country);
 }

src/main/java/com/example/demo/serviceImpl/coin/MarketServiceImpl.java

@@ -47,16 +47,16 @@ public class MarketServiceImpl implements MarketService {
     }
 
     @Override
-    public String getMarketIdsDao(String market) {
+    public String getMarketIdsDao(String country) {
         // 1. 参数验证
-        if (market == null || market.trim().isEmpty()) {
+        if (country == null || country.trim().isEmpty()) {
 
             return "24030";
         }
 
         try {
             // 2. 查询市场信息
-            Market marketObj = marketMapper.getMarketIdDao(market.trim());
+            Market marketObj = marketMapper.getMarketIdDao(country);
 
             // 3. 空值检查
             if (marketObj == null) {

src/main/resources/application-prod.yml

@@ -46,6 +46,7 @@ spring:
         maximum-pool-size: 10
     sqlserver1:
       jdbc-url: jdbc:sqlserver://10.19.183.6:1433;encrypt=true;sslProtocol=TLSv1;trustServerCertificate=true;
+#      jdbc-url: jdbc:sqlserver://52.76.43.43:1433;encrypt=true;sslProtocol=TLSv1;trustServerCertificate=true;
       username: gjb_test
       password: qweuio!@#$2
       driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver

src/main/resources/cashMapper/CashRefundMapper.xml

@@ -156,9 +156,9 @@
         cr.goods_name,
         cr.good_num,
         cr.payment_currency,
-        Round((payment_amount) / 100.0, 2) AS freeGold,
+        Round((payment_amount) / 100.0, 2) AS PaymentAmount,
         cr.received_currency,
-        Round((received_amount) / 100.0, 2) AS freeGold,
+        Round((received_amount) / 100.0, 2) AS receivedAmount,
         cr.handling_charge,
         cr.pay_type,
         cr.received_market,
@@ -186,6 +186,8 @@
         a2.area_finance,
         a2.area_charge,
         a2.head_finance,
+        cr.refund_currency,
+        cr.refund_amount,
         m.name as marketName
         from cash_record cr
         left join admin a1 on submitter_id = a1.id
@@ -219,11 +221,14 @@
                 </foreach>
             </if>
         <if test="paymentCurrency!= null and paymentCurrency.length() > 0">
-            AND cr.payment_currency = #{paymentCurrency}
+            AND cr.payment_currency LIKE CONCAT('%', #{paymentCurrency}, '%')
         </if>
 
-        <if test="goodsName != null and goodsName.length()>0">
-            and cr.goods_name = #{goodsName}
+            <if test="goodsNames!= null and goodsNames.size > 0">
+                AND cr.goods_name IN
+                <foreach collection="goodsNames" item="goodsNames" open="(" separator="," close=")">
+                    #{goodsNames}
+                </foreach>
             </if>
         <if test="payType != null and payType.length()>0">
             and cr.pay_type = #{payType}
@@ -238,5 +243,13 @@
             and cr.submitter_id = #{submitterId}
         </if>
         </where>
+        <choose>
+            <when test="sortField != null and sortField.length > 0 or sortOrder != null and sortOrder.length > 0">
+                ORDER BY ${sortField} ${sortOrder}
+            </when>
+            <otherwise>
+                ORDER BY create_time DESC
+            </otherwise>
+        </choose>
     </select>
 </mapper>

src/main/resources/mapper/MarketMapper.xml

@@ -29,8 +29,8 @@
     <select id="getMarketId" resultType="java.lang.String">
         select id from market where name=#{market}
     </select>
-    <select id="getMarketIdDao" resultType="java.lang.String">
-        select * from markets where name=#{market}
+    <select id="getMarketIdDao" resultType="com.example.demo.domain.entity.Market">
+        select * from markets where name=#{country}
     </select>
     <select id="getMarketIdBytype" resultType="com.example.demo.domain.entity.Market">
         select * from market where parent_id=#{parentId}