From c6534ea86a9e7fe2fb2da2466cd68a491b4ac4a7 Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Wed, 7 May 2025 14:31:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=A1=E7=94=A8=E5=8D=A1=E8=B4=A6?= =?UTF-8?q?=E5=8D=95=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../invest/domain/dto/FutureBaseInforDto.java | 5 +++++ .../invest/domain/vo/CreditCardBillVo.java | 17 +++++++++++++++++ .../impl/CreditCardBillServiceImpl.java | 18 ++++++++++++++++++ .../impl/FuturesDailyHistoryServiceImpl.java | 5 ++++- .../mapper/invest/CreditCardBillMapper.xml | 5 +++++ .../invest/CreditReportQueryRecordMapper.xml | 2 +- .../mapper/invest/FutureBaseInforMapper.xml | 3 +++ 7 files changed, 53 insertions(+), 2 deletions(-) diff --git a/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/dto/FutureBaseInforDto.java b/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/dto/FutureBaseInforDto.java index c423282..4d4e92b 100644 --- a/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/dto/FutureBaseInforDto.java +++ b/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/dto/FutureBaseInforDto.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; + /** * 期货基本合约Dto对象 invest_future_base_infor * @@ -29,4 +30,8 @@ public class FutureBaseInforDto implements Serializable @ApiModelProperty(value="标准合约id") private Long standardId; + /** 最后交易日 */ + @ApiModelProperty(value="最后交易日") + private String lastTradingDay; + } diff --git a/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/vo/CreditCardBillVo.java b/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/vo/CreditCardBillVo.java index 5f16257..e0a89e2 100644 --- a/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/vo/CreditCardBillVo.java +++ b/intc-modules/intc-invest/src/main/java/com/intc/invest/domain/vo/CreditCardBillVo.java @@ -1,10 +1,14 @@ package com.intc.invest.domain.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import com.intc.common.core.annotation.Excel; import com.intc.invest.domain.CreditCardBill; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import io.swagger.annotations.ApiModel; + +import java.util.Date; + /** * 信用卡账单Vo对象 credit_card_bill * @@ -29,5 +33,18 @@ public class CreditCardBillVo extends CreditCardBill @ApiModelProperty(value="POS刷卡占比)") private String posRate; + @ApiModelProperty(value="可用余额)") + private Double availableLimit; + + /** 还款日 */ + @ApiModelProperty(value="账单日") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date repaymentDay; + + /** 还款日 */ + @ApiModelProperty(value="还款日)") + private int payDate; + + } diff --git a/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/CreditCardBillServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/CreditCardBillServiceImpl.java index ff60f6b..79c20a1 100644 --- a/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/CreditCardBillServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/CreditCardBillServiceImpl.java @@ -69,6 +69,7 @@ public class CreditCardBillServiceImpl implements ICreditCardBillService { List creditCardBillList=creditCardBillMapper.selectCreditCardBillList(creditCardBillDto); //修改名称加卡号 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); // 设置日期格式 DecimalFormat decimalFormat = new DecimalFormat("#.###"); for (CreditCardBillVo creditCardBill : creditCardBillList) { if(creditCardBill.getBankName()!=null){ @@ -82,6 +83,23 @@ public class CreditCardBillServiceImpl implements ICreditCardBillService creditCardBill.setPosRate("--"); } + String repaymentDayStr = sdf.format(creditCardBill.getBillDate()).split("-")[0] + "-" + sdf.format(creditCardBill.getBillDate()).split("-")[1] + "-" + String.format("%02d", creditCardBill.getPayDate()); + try { + Date repaymentDay=sdf.parse(repaymentDayStr); + if(repaymentDay.before(creditCardBill.getBillDate())){ + // 加一个月 + Calendar calendar = Calendar.getInstance(); + calendar.setTime(repaymentDay); + calendar.add(Calendar.MONTH, 1); + repaymentDay = calendar.getTime(); + creditCardBill.setRepaymentDay(repaymentDay); + }else { + creditCardBill.setRepaymentDay(repaymentDay); + } + } catch (ParseException e) { + throw new RuntimeException(e); + } + } return creditCardBillList; } diff --git a/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/FuturesDailyHistoryServiceImpl.java b/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/FuturesDailyHistoryServiceImpl.java index 756de9f..90a7540 100644 --- a/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/FuturesDailyHistoryServiceImpl.java +++ b/intc-modules/intc-invest/src/main/java/com/intc/invest/service/impl/FuturesDailyHistoryServiceImpl.java @@ -225,7 +225,10 @@ public class FuturesDailyHistoryServiceImpl implements IFuturesDailyHistoryServi */ @Override public void synTodayFuturesDailyHistory() { - List futureBaseInforVos=futureBaseInforMapper.selectFutureBaseInforList(new FutureBaseInforDto()); + FutureBaseInforDto dto=new FutureBaseInforDto(); + SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); + dto.setLastTradingDay(formatter.format(new Date())); + List futureBaseInforVos= futureBaseInforMapper.selectFutureBaseInforList(dto); // for (FutureBaseInforVo base : futureBaseInforVos) { diff --git a/intc-modules/intc-invest/src/main/resources/mapper/invest/CreditCardBillMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/CreditCardBillMapper.xml index 9ed51b0..a2cbdc7 100644 --- a/intc-modules/intc-invest/src/main/resources/mapper/invest/CreditCardBillMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/CreditCardBillMapper.xml @@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + @@ -40,7 +42,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a.bill_state, a.remark, bc."name" as bank_name, + bc.pay_date, bc.code as bank_code, + a2.available_limit, ( select count(*) @@ -83,6 +87,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" credit_card_bill a left join bank_card_lend bc on bc.id = a.credit_card_id + left join accounts a2 on a2.id =a.credit_card_id diff --git a/intc-modules/intc-invest/src/main/resources/mapper/invest/FutureBaseInforMapper.xml b/intc-modules/intc-invest/src/main/resources/mapper/invest/FutureBaseInforMapper.xml index 2c174c7..280253b 100644 --- a/intc-modules/intc-invest/src/main/resources/mapper/invest/FutureBaseInforMapper.xml +++ b/intc-modules/intc-invest/src/main/resources/mapper/invest/FutureBaseInforMapper.xml @@ -67,6 +67,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and a.name like '%'|| #{name}||'%' and a.code = #{code} and a.standard_id = #{standardId} + + and to_char(a.last_trading_day, 'yyyy-MM-dd')>=#{lastTradingDay} + order by a.create_time desc