Merge branch 'dev/2024/0822/update-admin-Y' of feifan/mall-backend-admin into master

修改公众提现导入exel表异常

feifan-module-distri/feifan-module-distri-api/src/main/java/cn/newfeifan/mall/module/distri/enums/WithdrawalResultEnum.java

@@ -11,7 +11,7 @@ import lombok.Getter;
 @AllArgsConstructor
 public enum WithdrawalResultEnum {
 
-    SUCCESS("SUCCESS","交易成功"),
+    SUCCESS("SUCCESS","成功"),
     FAIL("FAIL","交易失败"),
     ;
 

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/applicationforwithdrawal/ApplicationForWithdrawalServiceImpl.java

@@ -1,10 +1,12 @@
 package cn.newfeifan.mall.module.distri.service.applicationforwithdrawal;
 
+import cn.newfeifan.mall.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.newfeifan.mall.module.distri.constant.DistriConstants;
 import cn.newfeifan.mall.module.distri.controller.admin.applicationforwithdrawalchannel.vo.ApplicationForWithdrawalChannelExcelRespVO;
 import cn.newfeifan.mall.module.distri.enums.WithdrawalChannelTypeEnum;
 import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
 import cn.newfeifan.mall.module.member.service.user.MemberUserService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -114,7 +116,10 @@ public class ApplicationForWithdrawalServiceImpl implements ApplicationForWithdr
 
     @Override
     public List<ApplicationForWithdrawalDO> selectListByChannelId(Long id) {
-        return applicationForWithdrawalMapper.selectList(ApplicationForWithdrawalDO::getApplicationForWithdrawalChannelId,id, ApplicationForWithdrawalDO::getStatus,0);
+        LambdaQueryWrapper<ApplicationForWithdrawalDO> wrapper = new LambdaQueryWrapperX<ApplicationForWithdrawalDO>()
+                .eq(ApplicationForWithdrawalDO::getApplicationForWithdrawalChannelId, id)
+                .apply("(status = 0 or status = 2)");
+        return applicationForWithdrawalMapper.selectList(wrapper);
     }
 
     @Override

feifan-module-distri/feifan-module-distri-biz/src/main/java/cn/newfeifan/mall/module/distri/service/applicationforwithdrawalchannel/ApplicationForWithdrawalChannelServiceImpl.java

@@ -176,7 +176,7 @@ public class ApplicationForWithdrawalChannelServiceImpl implements ApplicationFo
                         withdrawalTime.equals(formatter.format(withdrawalDO.getCreateTime()))
                 ) {
 
-                    if (importVO.getPayResult().equals(WithdrawalResultEnum.SUCCESS.getResult())) {
+                    if (importVO.getPayResult().contains(WithdrawalResultEnum.SUCCESS.getResult()) || importVO.getPayResult().contains("成功")) {
                         withdrawalDO.setStatus(WithdrawalEnum.WITHDRAWAL_SUCCESS.getStatus());
                     } else {
                         withdrawalDO.setStatus(WithdrawalEnum.WITHDRAWAL_FAIL.getStatus());