Ver código fonte

feat : sdk后台修改

bilingfeng 2 anos atrás
pai
commit
963e32e2b8

+ 8 - 0
game-module/game-manage/src/main/java/com/zanxiang/manage/service/IPayMerchantService.java

@@ -83,4 +83,12 @@ public interface IPayMerchantService extends IService<PayMerchant> {
      * @return {@link Map}<{@link String}, {@link PayMerchantDTO}>
      * @return {@link Map}<{@link String}, {@link PayMerchantDTO}>
      */
      */
     Map<String, PayMerchantDTO> payMerchantMap();
     Map<String, PayMerchantDTO> payMerchantMap();
+
+    /**
+     * 由商人没有得到
+     *
+     * @param merchantNo 商人没有
+     * @return {@link PayMerchantDTO}
+     */
+    PayMerchantDTO getByMerchantNo(String merchantNo);
 }
 }

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

@@ -107,6 +107,9 @@ public class PayBoxServiceImpl extends ServiceImpl<PayBoxMapper, PayBox> impleme
             String[] merchantNoArray = payBox.getMerchantNos().split(",");
             String[] merchantNoArray = payBox.getMerchantNos().split(",");
             for (String merchantNo : merchantNoArray) {
             for (String merchantNo : merchantNoArray) {
                 PayMerchantDTO payMerchantDTO = payMerchantMap.get(merchantNo);
                 PayMerchantDTO payMerchantDTO = payMerchantMap.get(merchantNo);
+                if (payMerchantDTO == null) {
+                    payMerchantDTO = payMerchantService.getByMerchantNo(merchantNo);
+                }
                 if (payMerchantDTO != null) {
                 if (payMerchantDTO != null) {
                     merchantMap.put(merchantNo, payMerchantDTO.getMerchantName());
                     merchantMap.put(merchantNo, payMerchantDTO.getMerchantName());
                 }
                 }

+ 11 - 0
game-module/game-manage/src/main/java/com/zanxiang/manage/service/impl/PayMerchantServiceImpl.java

@@ -21,6 +21,7 @@ import com.zanxiang.manage.service.IPayDeviceService;
 import com.zanxiang.manage.service.IPayMerchantService;
 import com.zanxiang.manage.service.IPayMerchantService;
 import com.zanxiang.manage.service.IPayWayService;
 import com.zanxiang.manage.service.IPayWayService;
 import com.zanxiang.module.util.JsonUtil;
 import com.zanxiang.module.util.JsonUtil;
+import com.zanxiang.module.util.bean.BeanUtil;
 import com.zanxiang.mybatis.entity.PayMerchant;
 import com.zanxiang.mybatis.entity.PayMerchant;
 import com.zanxiang.mybatis.mapper.PayMerchantMapper;
 import com.zanxiang.mybatis.mapper.PayMerchantMapper;
 import org.apache.logging.log4j.util.Strings;
 import org.apache.logging.log4j.util.Strings;
@@ -245,4 +246,14 @@ public class PayMerchantServiceImpl extends ServiceImpl<PayMerchantMapper, PayMe
         return BeanUtils.copyList(payMerchantList, PayMerchantDTO.class)
         return BeanUtils.copyList(payMerchantList, PayMerchantDTO.class)
                 .stream().collect(Collectors.toMap(PayMerchantDTO::getMerchantNo, Function.identity()));
                 .stream().collect(Collectors.toMap(PayMerchantDTO::getMerchantNo, Function.identity()));
     }
     }
+
+    @Override
+    public PayMerchantDTO getByMerchantNo(String merchantNo) {
+        PayMerchant payMerchant = super.getOne(new LambdaQueryWrapper<PayMerchant>()
+                .eq(PayMerchant::getMerchantNo, merchantNo));
+        if (payMerchant == null) {
+            return null;
+        }
+        return BeanUtil.copy(payMerchant, PayMerchantDTO.class);
+    }
 }
 }