44323
2023-11-23 acad524bfb7f376c09ff8e6600fab207780156e1
cloud-server-account/src/main/java/com/dsh/account/controller/FinanceController.java
@@ -18,6 +18,7 @@
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
@@ -40,7 +41,22 @@
    @ResponseBody
    @RequestMapping("/finance/rechargeList")
    public List<RechargeRecordsVO> rechargeList(@RequestBody RechargeRecordsQuery query){
        return  rechargeRecordsService.rechargeList(query);
        List<RechargeRecordsVO> rechargeRecordsVOS = rechargeRecordsService.rechargeList(query);
        for (RechargeRecordsVO rechargeRecordsVO : rechargeRecordsVOS) {
            TAppUser byId = appUserService.getById(rechargeRecordsVO.getAppUserId());
            if (byId==null)continue;
            Date vipEndTime = byId.getVipEndTime();
            if (vipEndTime==null){
                rechargeRecordsVO.setType(2);
                continue;
            }
            if (rechargeRecordsVO.getPayTime().after(vipEndTime)){
                rechargeRecordsVO.setType(2);
            }else{
                rechargeRecordsVO.setType(1);
            }
        }
        return  rechargeRecordsVOS;
    }
    /**
     * 数据统计-充值记录列表数据