修改bug

puzhibing

2024-03-15 b3e0d0ea6c1e311566bab861b79cc9b9c6d25287

 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java

@@ -20,6 +20,8 @@
import com.dsh.account.enums.RechargeRecordEnum;
import com.dsh.account.feignclient.activity.*;
import com.dsh.account.feignclient.activity.model.*;
import com.dsh.account.feignclient.communityWorldCup.WorldCupPaymentClinet;
import com.dsh.account.feignclient.communityWorldCup.model.GetWorldCupPayment;
import com.dsh.account.feignclient.competition.DeductionCompetitionsClient;
import com.dsh.account.feignclient.competition.model.BillingDataRequestVo;
import com.dsh.account.feignclient.course.CoursePackageClient;
@@ -180,6 +182,9 @@

    @Autowired
    private IRefereeService refereeService;

    @Resource
    private WorldCupPaymentClinet worldCupPaymentClinet;



@@ -947,6 +952,30 @@
                        .collect(Collectors.toList());
            }
        }

        //世界杯
        GetWorldCupPayment getWorldCupPayment = new GetWorldCupPayment();
        getWorldCupPayment.setAppUserId(appUserId);
        getWorldCupPayment.setPayType("1,2");
        getWorldCupPayment.setStartTime(monthStart);
        getWorldCupPayment.setEndTime(monthEnd);
        List<WorldCupPayment> worldCupPayment = worldCupPaymentClinet.getWorldCupPayment(getWorldCupPayment);
        for (WorldCupPayment cupPayment : worldCupPayment) {
            ConsumeDetail consumeDetail = new ConsumeDetail();
            if(cupPayment.getPayStatus() != 3){
                consumeDetail.setConsumeName(RechargeRecordEnum.WORLD_CIP_PAYMENT.getMsg());
                consumeDetail.setConsumeTime(simpleDateFormat.format(cupPayment.getCreateTime()));
                consumeDetail.setConsumeAmount("-" + cupPayment.getAmount());
                consumeDetail.setType(2);
            }else{
                consumeDetail.setConsumeName(RechargeRecordEnum.CANCEL_WORLD_CIP_PAYMENT.getMsg());
                consumeDetail.setConsumeTime(simpleDateFormat.format(cupPayment.getCreateTime()));
                consumeDetail.setConsumeAmount("+" + cupPayment.getRefundAmount());
                consumeDetail.setType(1);
            }
            details.add(consumeDetail);
        }

        return details;
    }