feat : sdk后台修改

game-module/game-manage/src/main/java/com/zanxiang/manage/service/impl/PayBoxServiceImpl.java

@@ -101,8 +101,8 @@ public class PayBoxServiceImpl extends ServiceImpl<PayBoxMapper, PayBox> impleme
             payBoxListVO.setPayApplicationCompany(payApplicationDTO.getCompany());
         }
         Map<String, String> merchantMap = new HashMap<>(payMerchantMap.size());
-        if (Strings.isNotBlank(payBox.getMerchantIds())) {
-            String[] merchantNoArray = payBox.getMerchantIds().split(",");
+        if (Strings.isNotBlank(payBox.getMerchantNos())) {
+            String[] merchantNoArray = payBox.getMerchantNos().split(",");
             for (String merchantNo : merchantNoArray) {
                 PayMerchantDTO payMerchantDTO = payMerchantMap.get(merchantNo);
                 if (payMerchantDTO != null) {

game-module/game-mybatis/src/main/java/com/zanxiang/mybatis/entity/PayBox.java

@@ -46,7 +46,7 @@ public class PayBox implements Serializable {
     /**
      * 商户号（多个逗号分割）
      */
-    private String merchantIds;
+    private String merchantNos;
 
     /**
      * 盒子类型 1、小程序 2、微信公众号

game-module/game-sdk/src/main/java/com/zanxiang/sdk/domain/dto/PayBoxDTO.java

@@ -28,7 +28,7 @@ public class PayBoxDTO {
     /**
      * 商户号（多个逗号分割）
      */
-    private String merchantIds;
+    private String merchantNos;
 
     /**
      * 盒子类型 1、小程序 2、微信公众号

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/IPayMerchantService.java

@@ -23,10 +23,10 @@ public interface IPayMerchantService extends IService<PayMerchant> {
     PayMerchantDTO getByMerchantNo(String merchantNo);
 
     /**
-     * 通过id
+     * 通过商户号列表查询
      *
-     * @param ids id
+     * @param merchantNoList 商户号列表
      * @return {@link List}<{@link PayMerchantDTO}>
      */
-    List<PayMerchantDTO> getByIds(List<Long> ids);
+    List<PayMerchantDTO> getByMerchantNos(List<String> merchantNoList);
 }

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/impl/PayBoxServiceImpl.java

@@ -39,15 +39,15 @@ public class PayBoxServiceImpl extends ServiceImpl<PayBoxMapper, PayBox> impleme
             throw new BaseException("参数错误, 支付盒子信息不存在");
         }
         //查询盒子绑定的商户
-        String merchantIds = payBox.getMerchantIds();
-        if (Strings.isBlank(merchantIds)) {
+        String merchantNos = payBox.getMerchantNos();
+        if (Strings.isBlank(merchantNos)) {
             log.error("数据错误,盒子未绑定商户, payBoxId : {}", payBoxId);
             throw new BaseException("数据错误,盒子未绑定商户");
         }
-        String[] merchantIdArray = merchantIds.split(",");
-        List<Long> ids = Arrays.stream(merchantIdArray).map(Long::new).collect(Collectors.toList());
+        String[] merchantNoArray = merchantNos.split(",");
+        List<String> merchantNoList = Arrays.stream(merchantNoArray).collect(Collectors.toList());
         //查询商户列表
-        List<PayMerchantDTO> payMerchantDTOList = payMerchantService.getByIds(ids);
+        List<PayMerchantDTO> payMerchantDTOList = payMerchantService.getByMerchantNos(merchantNoList);
         //当前时间与商户个数取模, 获得随机数
         int sit = (int) System.currentTimeMillis() % payMerchantDTOList.size();
         //返回商户信息

game-module/game-sdk/src/main/java/com/zanxiang/sdk/service/impl/PayMerchantServiceImpl.java

@@ -37,16 +37,16 @@ public class PayMerchantServiceImpl extends ServiceImpl<PayMerchantMapper, PayMe
     }
 
     @Override
-    public List<PayMerchantDTO> getByIds(List<Long> ids) {
-        if (CollectionUtils.isEmpty(ids)) {
-            log.error("参数错误, 商户id列表不存在");
+    public List<PayMerchantDTO> getByMerchantNos(List<String> merchantNoList) {
+        if (CollectionUtils.isEmpty(merchantNoList)) {
+            log.error("参数错误, 商户号列表不存在");
             throw new BaseException("参数错误, 商户id列表不存在");
         }
         List<PayMerchant> payMerchantList = super.list(new LambdaQueryWrapper<PayMerchant>()
-                .in(PayMerchant::getId, ids)
+                .in(PayMerchant::getMerchantNo, merchantNoList)
                 .eq(PayMerchant::getMaxPayLock, 0));
         if (CollectionUtils.isEmpty(payMerchantList)) {
-            log.error("参数错误, 符合条件的商户不存在, ids : {}", ids);
+            log.error("参数错误, 符合条件的商户不存在, ids : {}", merchantNoList);
             throw new BaseException("参数错误, 符合条件的商户不存在");
         }
         return BeanUtils.copyList(payMerchantList, PayMerchantDTO.class);