Merge remote-tracking branch 'origin/master'

yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java

@@ -202,7 +202,7 @@ public class RechargeOrderServiceImpl implements RechargeOrderService {
         Assert.notNull(loginUser, "登录失效,请重新登录!");
         List<RechargeOrderDO> orderDOS = rechargeOrderMapper.selectList(Wrappers.<RechargeOrderDO>lambdaQuery()
                 .eq(RechargeOrderDO::getUid, loginUser.getId())
-                .ne(RechargeOrderDO::getPaid, 0)
+                .ne(RechargeOrderDO::getPaid, 1)
                 .orderByDesc(RechargeOrderDO::getCreateTime));
         if (!CollectionUtils.isEmpty(orderDOS)) {
             List<RechargeOrderRespVO> rechargeOrderRespVOS = RechargeOrderConvert.INSTANCE.convertList(orderDOS);

yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java

@@ -225,7 +225,7 @@ public class PromoterServiceImpl implements PromoterService {
         Set<String> collect = importUsers.stream().map(PromoterImportExcelVO::getMobile).collect(Collectors.toSet());
         List<String> collect2 = importUsers.stream().map(PromoterImportExcelVO::getMobile).collect(Collectors.toList());
         if (collect.size() != collect2.size()) {
-            respVO.getFailureUsernames().put("导入文件电话号码存在重复请检查!", "电话号码" + collect);
+            respVO.getFailureUsernames().put("导入文件电话号码存在重复请检查!", "");
             return respVO;
         }