10.20增加限制条件

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

@@ -323,7 +323,7 @@ public class MysqlServiceImpl implements MysqlService {
         if (ObjectUtils.isEmpty(user)) {
             logger.info("用户不存在，jwcode={}", data.jwcode);
             user = new User();
-            List<String> country = Collections.singletonList("未知");
+            String country = "未知";
             String name = "未知";
 
             try {
@@ -349,7 +349,7 @@ public class MysqlServiceImpl implements MysqlService {
                             name = (String) dataMap.get("name");
                             Object countryObj = dataMap.get("country");
                             if (countryObj instanceof List) {
-                                country = (List<String>) countryObj;
+                                country = (String) countryObj;
                             }
                             logger.info("获取用户信息成功: name={}, country={}", name, country);
                         }
@@ -357,10 +357,10 @@ public class MysqlServiceImpl implements MysqlService {
                 }
             } catch (Exception e) {
                 logger.warn("获取用户信息失败，jwcode={}", data.jwcode, e);
-                country = Collections.singletonList("未知");
+                country = "未知";
             }
 
-            String market = String.join(",", marketService.getMarketIds(country));
+            String market = marketService.getMarketIdsDao(country);
             user.setJwcode(data.jwcode);
             user.setName(name);
             user.setMarket(market);

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

@@ -107,7 +107,7 @@ public class CashRecordDone {
 
     private String areaServise;
     private String areaFinance;
-    private String areacharge;
+    private String areaCharge;
     private String headFinance;
 
 

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

@@ -11,4 +11,7 @@ public interface MarketMapper {
     List<String> getMarketIds(List<String> list);
     //获取单个市场id
     String getMarketId(String market);
+
+    Market getMarketIdDao(String  market);
+    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
-    List<String> getMarketIdsDao(List<String> list);
+    String getMarketIdsDao(String market);
 }

src/main/java/com/example/demo/serviceImpl/cash/CashRefundServiceImpl.java

@@ -162,7 +162,7 @@ CashRecordDone cashRecordDone1 = new CashRecordDone();
             cashRecordDone1.setStatus(4);
             if (cashRecordDone1.getId()!=null||cashRecordDone1.getOrderCode()!= null){
             cashRefundMapper.updateStatus(cashRecordDone1);
-        }
+        }}
         if (cashRecordDone.getGoodsName() != null &&
                 (cashRecordDone.getGoodsName().equals("金币充值") ||
                         cashRecordDone.getGoodsName().contains("金币充值"))) {
@@ -196,7 +196,10 @@ CashRecordDone cashRecordDone1 = new CashRecordDone();
                 GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 58, //退款免费+永久金币-充值
                         (double) (userGoldRecord.getFreeDecember()+userGoldRecord.getFreeJune()+userGoldRecord.getPermanentGold() ) /100,
                         userGoldRecord.getRemark(),(double) userGoldRecord.getPermanentGold() / 100, auditName, "退款金币充值");}
-        cashRefundMapper.updateAudit(cashRecordDone);}
+        CashRecordDone cashRecordDone1 = new CashRecordDone();
+        cashRecordDone1.setHeadFinance(cashRecordDone.getHeadFinance());
+        cashRecordDone1.setId(cashRecordDone.getAuditId());
+        cashRefundMapper.updateAudit(cashRecordDone1);
         int result = cashRefundMapper.review(cashRecordDone);
         return (result > 0 ? Result.success("提交成功") : Result.error("提交失败")).getCode();
     }

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

@@ -1,7 +1,6 @@
 package com.example.demo.serviceImpl.coin;
 
 import com.example.demo.domain.entity.Market;
-import com.example.demo.domain.vo.coin.MenuVo;
 import com.example.demo.mapper.coin.MarketMapper;
 import com.example.demo.service.coin.MarketService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,8 +47,13 @@ public class MarketServiceImpl implements MarketService {
     }
 
     @Override
-    public List<String> getMarketIdsDao(List<String> list) {
-        return List.of();
+    public String getMarketIdsDao(String market) {
+        Market Market = marketMapper.getMarketIdDao(market);
+        if (Market.getType()==3){
+            return String.valueOf(Market.getParentId());
+        }
+        return String.valueOf(Market.getId());
     }
 
+
 }

src/main/resources/cashMapper/CashRefundMapper.xml

@@ -12,6 +12,7 @@
             bank_code,
             goods_name,
             good_num,
+            audit_id,
             payment_currency,
             payment_amount,
             received_currency,
@@ -42,6 +43,7 @@
                      #{bankCode},
                      #{goodsName},
                      #{goodNum},
+                     #{auditId},
                      #{paymentCurrency},
                      #{paymentAmount},
                      #{receivedCurrency},
@@ -78,7 +80,7 @@
                     #{areaServise},
                     #{areaFinance},
                     #{areacharge},
-                    #{head_finance}
+                    #{headFinance}
                 )
 
     </insert>
@@ -123,20 +125,17 @@
     <update id="updateAudit">
         update lhl_audit
         <set>
-            <if test="area_servise != null">
-                area_servise = #{area_servise},
+            <if test="areaServise != null">
+                area_servise = #{areaServise},
             </if>
-            <if test="area_finance != null">
-                area_finance = #{area_finance},
+            <if test="areaFinance != null">
+                area_finance = #{areaFinance},
             </if>
-            <if test="area_charge != null">
-                area_charge = #{area_charge},
+            <if test="areaCharge != null">
+                area_charge = #{areaCharge},
             </if>
-            <if test="head_finance != null">
-                head_finance = #{head_finance},
-            </if>
-            <if test="execcutor != null">
-                execcutor = #{execcutor},
+            <if test="headFinance != null">
+                head_finance = #{headFinance},
             </if>
         </set>
         where id = #{auditId}

src/main/resources/mapper/MarketMapper.xml

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