8月1日充值地区接口

src/main/java/com/example/demo/controller/bean/BeanRechargeController.java

@@ -79,6 +79,13 @@ public class BeanRechargeController {
             return Result.error("请检查数据的格式");
         }
     }
+    //获取系统充值地区
+    @PostMapping("/systemMarket")
+    public Result systemMarket()
+    {
+        List<String> list = beanRechargeService.systemMarket();
+        return Result.success(list);
+    }
 
     //线上充值
     @PostMapping("/selectByOnline")
@@ -109,4 +116,12 @@ public class BeanRechargeController {
             return Result.error("请检查数据的格式");
         }
     }
+
+    //获取线上充值地区
+    @PostMapping("/onlineMarket")
+    public Result onlineMarket()
+    {
+        List<String> list = beanRechargeService.onlineMarket();
+        return Result.success(list);
+    }
 }

src/main/java/com/example/demo/mapper/bean/BeanRechargeMapper2.java

@@ -20,4 +20,5 @@ public interface BeanRechargeMapper2 {
 
     List<BeanRechargeInfo> selectBySystem(BeanRechargeInfo beanRechargeInfo);
 
+    List<String> systemMarket();
 }

src/main/java/com/example/demo/mapper/pay/BeanRechargeMapper3.java

@@ -20,4 +20,5 @@ public interface BeanRechargeMapper3 {
 
     List<BeanRechargeInfo> selectByOnline(BeanRechargeInfo beanRechargeInfo);
 
+    List<String> systemMarket();
 }

src/main/java/com/example/demo/service/bean/BeanRechargeService.java

@@ -8,6 +8,8 @@ import com.example.demo.domain.vo.coin.Result;
 import com.example.demo.domain.vo.bean.BeanRecharge;
 import com.github.pagehelper.PageInfo;
 
+import java.util.List;
+
 /**
  * @program: gold-java
  * @ClassName BeanRechargeService
@@ -33,4 +35,10 @@ public interface BeanRechargeService {
 
     //线上金豆统计
     GoldBean statsOnlineBean(BeanRechargeInfo beanRechargeInfo);
+
+    //获取系统充值地区
+    List<String> systemMarket();
+
+    //获取线上充值地区
+    List<String> onlineMarket();
 }

src/main/java/com/example/demo/serviceImpl/bean/BeanRechargeServiceImpl.java

@@ -20,7 +20,9 @@ import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
 
 import java.util.List;
+import java.util.Objects;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 /**
  * @program: gold-java
@@ -146,6 +148,17 @@ public class BeanRechargeServiceImpl implements BeanRechargeService {
         return gold;
     }
 
+    @Override
+    public List<String> systemMarket() {
+        List<String> list = beanRechargeMapper2.systemMarket();
+        // 使用 Java 8 的 Stream API 过滤 null 和空字符串
+        List<String> filteredList = list.stream()
+                .filter(Objects::nonNull)  // 过滤掉 null 值
+                .filter(str -> !str.trim().isEmpty())  // 过滤掉空字符串和仅包含空白字符的字符串
+                .collect(Collectors.toList());
+        return filteredList;
+    }
+
     //线上充值明细
     @Override
     public PageInfo<BeanRechargeInfo> selectByOnline(Integer pageNum, Integer pageSize, BeanRechargeInfo beanRechargeInfo){
@@ -182,4 +195,17 @@ public class BeanRechargeServiceImpl implements BeanRechargeService {
         return gold;
     }
 
+
+
+    @Override
+    public List<String> onlineMarket() {
+        List<String> list = beanRechargeMapper3.systemMarket();
+        // 使用 Java 8 的 Stream API 过滤 null 和空字符串
+        List<String> filteredList = list.stream()
+                .filter(Objects::nonNull)  // 过滤掉 null 值
+                .filter(str -> !str.trim().isEmpty())  // 过滤掉空字符串和仅包含空白字符的字符串
+                .collect(Collectors.toList());
+        return filteredList;
+    }
+
 }

src/main/resources/jindouMapper/BeanRechargeMapper2.xml

@@ -57,4 +57,8 @@
             </choose>
         </trim>
     </select>
+
+    <select id="systemMarket" resultType="java.lang.String">
+        select DISTINCT dept from fx_member
+    </select>
 </mapper>

src/main/resources/paymapper/BeanRechargeMapper3.xml

@@ -63,4 +63,8 @@
             </choose>
         </trim>
     </select>
+
+    <select id="onlineMarket" resultType="java.lang.String">
+        select DISTINCT deptName from member_info
+    </select>
 </mapper>