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

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

@@ -3,11 +3,8 @@ package cn.newfeifan.mall.module.distri.service.applicationforwithdrawalchannel;
 import cn.newfeifan.mall.framework.common.exception.ErrorCode;
 import cn.newfeifan.mall.module.distri.constant.DistriConstants;
 import cn.newfeifan.mall.module.distri.controller.admin.applicationforwithdrawal.vo.ApplicationForWithdrawalSaveReqVO;
-import cn.newfeifan.mall.module.distri.controller.admin.integral.vo.IntegralSaveReqVO;
 import cn.newfeifan.mall.module.distri.controller.admin.ptdailywithdrawal.vo.PtDailyWithdrawalSaveReqVO;
-import cn.newfeifan.mall.module.distri.controller.admin.ptprofitlog.vo.PtProfitLogSaveReqVO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.applicationforwithdrawal.ApplicationForWithdrawalDO;
-import cn.newfeifan.mall.module.distri.dal.dataobject.integral.IntegralDO;
 import cn.newfeifan.mall.module.distri.dal.dataobject.ptdailywithdrawal.PtDailyWithdrawalDO;
 import cn.newfeifan.mall.module.distri.enums.PtSettlemntStatusEnum;
 import cn.newfeifan.mall.module.distri.enums.WithdrawalEnum;
@@ -16,11 +13,8 @@ import cn.newfeifan.mall.module.distri.service.applicationforwithdrawal.Applicat
 import cn.newfeifan.mall.module.distri.service.integral.IntegralService;
 import cn.newfeifan.mall.module.distri.service.ptdailywithdrawal.PtDailyWithdrawalService;
 import cn.newfeifan.mall.module.distri.service.ptprofitlog.PtProfitLogService;
-import cn.newfeifan.mall.module.member.dal.dataobject.user.MemberUserDO;
 import cn.newfeifan.mall.module.member.service.user.MemberUserService;
 import cn.newfeifan.mall.module.system.api.sms.SmsCodeApi;
-import cn.newfeifan.mall.module.system.api.sms.dto.code.SmsCodeSendReqDTO;
-import cn.newfeifan.mall.module.system.enums.sms.SmsSceneEnum;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -167,8 +161,8 @@ public class ApplicationForWithdrawalChannelServiceImpl implements ApplicationFo
             Double money = Double.parseDouble(importVO.getMoney());
 
             for (ApplicationForWithdrawalDO withdrawalDO : withdrawalList) {
-                withdrawalDO.setAmount(withdrawalDO.getAmount() / DistriConstants.ONE_HUNDRED);
-                Double amount = Double.parseDouble(withdrawalDO.getAmount().toString());
+//                withdrawalDO.setAmount(withdrawalDO.getAmount() / DistriConstants.ONE_HUNDRED);
+                Double amount = Double.parseDouble(String.valueOf((withdrawalDO.getAmount() / DistriConstants.ONE_HUNDRED)));
 
                 // 当前提提现记录的金额和账号与Excel中的金额和账号一致时
                 if (money.equals(amount) &&
@@ -183,36 +177,35 @@ public class ApplicationForWithdrawalChannelServiceImpl implements ApplicationFo
                         // 记录提现失败的记录
                         errorList.add(importVO);
 
-                        // 退回用户提现积分数量
-                        IntegralDO integralDO = integralService.selectByUser(withdrawalDO.getUserId());
-                        Long integral = money.longValue() * MILLION;
-
-                        integralDO.setCurrentQuota(integralDO.getCurrentQuota() + integral);
-                        integralService.updateIntegral(BeanUtils.toBean(integralDO, IntegralSaveReqVO.class));
-
-                        // 添加用户积分变动Log
-                        PtProfitLogSaveReqVO ptProfitLogSaveReqVO = PtProfitLogSaveReqVO.builder()
-                                .amount(integral)
-                                .afterAmount(integralDO.getCurrentQuota())
-                                .profitStatus(WITHDRAWAL_ERROR.getType())
-                                .userId(withdrawalDO.getUserId())
-                                .generateUserId(integralDO.getUserId())
-                                .build();
-                        ptProfitLogService.createPtProfitLog(ptProfitLogSaveReqVO);
-
-                        MemberUserDO user = memberUserService.getUser(withdrawalDO.getUserId());
-                        // 发送短信通知用户提现失败
-                        SmsCodeSendReqDTO smsCodeSendReqDTO = SmsCodeSendReqDTO.builder()
-                                .mobile(user.getMobile())
-                                .scene(SmsSceneEnum.MEMBER_WITHDRAWAL_ERROR.getScene())
-                                .createIp(getClientIP())
-                                .sendTime(withdrawalDO.getCreateTime())
-                                .build();
-                        smsCodeApi.sendSmsCode(smsCodeSendReqDTO);
+//                        // 退回用户提现积分数量
+//                        IntegralDO integralDO = integralService.selectByUser(withdrawalDO.getUserId());
+//                        Long integral = money.longValue() * MILLION;
+//
+//                        integralDO.setCurrentQuota(integralDO.getCurrentQuota() + integral);
+//                        integralService.updateIntegral(BeanUtils.toBean(integralDO, IntegralSaveReqVO.class));
+//
+//                        // 添加用户积分变动Log
+//                        PtProfitLogSaveReqVO ptProfitLogSaveReqVO = PtProfitLogSaveReqVO.builder()
+//                                .amount(integral)
+//                                .afterAmount(integralDO.getCurrentQuota())
+//                                .profitStatus(WITHDRAWAL_ERROR.getType())
+//                                .userId(withdrawalDO.getUserId())
+//                                .generateUserId(integralDO.getUserId())
+//                                .build();
+//                        ptProfitLogService.createPtProfitLog(ptProfitLogSaveReqVO);
+//
+//                        MemberUserDO user = memberUserService.getUser(withdrawalDO.getUserId());
+//                        // 发送短信通知用户提现失败
+//                        SmsCodeSendReqDTO smsCodeSendReqDTO = SmsCodeSendReqDTO.builder()
+//                                .mobile(user.getMobile())
+//                                .scene(SmsSceneEnum.MEMBER_WITHDRAWAL_ERROR.getScene())
+//                                .createIp(getClientIP())
+//                                .sendTime(withdrawalDO.getCreateTime())
+//                                .build();
+//                        smsCodeApi.sendSmsCode(smsCodeSendReqDTO);
                     }
 
                     withdrawalService.updateApplicationForWithdrawal(BeanUtils.toBean(withdrawalDO, ApplicationForWithdrawalSaveReqVO.class));
-
                 }
             }
         }

sql/mysql/建空库SQL/24_20240929.sql

@@ -0,0 +1,2 @@
+ALTER TABLE member_user
+    ADD COLUMN `android_register_id` varchar(50) default null comment '安卓app注册id';