From 51da3f9416b82f537ec0d44c27c8ea745d0c9049 Mon Sep 17 00:00:00 2001 From: yuyang Date: Mon, 21 Mar 2022 16:41:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8D=A1=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/xhpc/card/domain/BindCardInfo.java | 1 - .../domain/QueryRechargingRecordResponse.java | 27 ++++++++++++++++++- .../service/impl/XhpcCardServiceImpl.java | 14 +++++++--- .../resources/mapper/TIccardLogMapper.xml | 1 + .../XhpcTimingChargingModelController.java | 4 +-- 5 files changed, 40 insertions(+), 7 deletions(-) diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/BindCardInfo.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/BindCardInfo.java index 27740095..2fcade52 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/BindCardInfo.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/BindCardInfo.java @@ -63,7 +63,6 @@ public class BindCardInfo { * 卡押金 */ @JsonProperty("cashPledge") - @NotNull(message = "cashPledge的参数名不正确或者cashPledge的值为空，请检查传入参数") private Long cashPledge; } diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryRechargingRecordResponse.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryRechargingRecordResponse.java index c8ede510..1d29bd53 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryRechargingRecordResponse.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryRechargingRecordResponse.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Data; import lombok.NoArgsConstructor; +import java.math.BigDecimal; import java.util.List; /** @@ -45,6 +46,16 @@ public class QueryRechargingRecordResponse { */ @JsonProperty("orderNumber") private String orderNumber; + /** + * 订单编号 + */ + @JsonProperty("rechargeOrderNumber") + private String rechargeOrderNumber; + /** + * 充值金额 + */ + @JsonProperty("amount") + private BigDecimal amount; /** * 充值金额 */ @@ -55,17 +66,31 @@ public class QueryRechargingRecordResponse { */ @JsonProperty("rechargeMethod") private String rechargeMethod; + /** + * 充值方式（1 微信 2 支付宝 3 平台 4 卡机设备) + */ + @JsonProperty("type") + private Integer type; /** * 订单状态（0待支付 1充值成功，2充值失败） */ @JsonProperty("orderStatus") private Integer orderStatus; + /** + * 订单状态（0待支付 1充值成功，2充值失败） + */ + @JsonProperty("status") + private Integer status; /** * 创建时间 */ @JsonProperty("createTime") private String createTime; - + /** + * 用户类型 8离线端 + */ + @JsonProperty("source") + private Integer source; } } diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java index 4602a736..cfca47b8 100644 --- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java +++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java @@ -20,6 +20,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; @@ -398,7 +399,7 @@ public class XhpcCardServiceImpl implements IXhpcCardService { TIccardInfo tIccardInfo = new TIccardInfo(); tIccardInfo.setId(bindCardInfo.getCardRecordId()); tIccardInfo.setStatus(1); - tIccardInfo.setCashpledge(Math.toIntExact(bindCardInfo.getCashPledge())); + //tIccardInfo.setCashpledge(Math.toIntExact(bindCardInfo.getCashPledge())); tIccardInfoMapper.updateByPrimaryKeySelective(tIccardInfo); xhpcCardMapper.insertSelective(xhpcIcCardInfo); //write log info @@ -419,7 +420,7 @@ public class XhpcCardServiceImpl implements IXhpcCardService { cardInfoDTO.setPassword(tIccardInfo.getPassword()); cardInfoDTO.setUserIndex(tIccardInfo.getUserindex()); cardInfoDTO.setCorpNo(tIccardInfo.getCorpno()); - cardInfoDTO.setCashPledge(tIccardInfo.getCashpledge()); + //cardInfoDTO.setCashPledge(tIccardInfo.getCashpledge()); cardInfoDTO.setBalance(tIccardInfo.getBalance()); cardInfoDTO.setStatus(tIccardInfo.getStatus()); cardInfoDTO.setPrepay(null); @@ -562,7 +563,9 @@ public class XhpcCardServiceImpl implements IXhpcCardService { dataDTO.setGrantOperatorName(operator.getName()); dataDTO.setCardSerialNumber(tIccardLog.getUniqueid()); dataDTO.setOperate(Integer.valueOf(tIccardLog.getOperate())); - dataDTO.setCashPledge(Long.valueOf(cardInfo.getCashPledge())); + if(cardInfo.getCashPledge() !=null){ + dataDTO.setCashPledge(Long.valueOf(cardInfo.getCashPledge())); + } Integer balance = cardInfo.getBalance(); if (balance != null) { dataDTO.setBalance(Long.valueOf(balance)); @@ -642,12 +645,17 @@ public class XhpcCardServiceImpl implements IXhpcCardService { dataDTO.setUserAccount(accountStr); //Get orderNumber（not found in the MySQL database） dataDTO.setOrderNumber(null); + dataDTO.setRechargeOrderNumber(null); //Get rechargeMoney + dataDTO.setAmount(new BigDecimal(cardInfo.getPrepay())); dataDTO.setRechargeMoney(Long.valueOf(cardInfo.getPrepay())); //Get rechargeMethod (not found in the MySQL database) dataDTO.setRechargeMethod("4"); dataDTO.setOrderStatus(1); + dataDTO.setStatus(1); + dataDTO.setType(4); dataDTO.setCreateTime(MyDateUtil.parseDateToStr(tIccardLog.getCreatetime())); + dataDTO.setSource(8); queryRechargingRecordResponse.getData().add(dataDTO); } return R.ok(queryRechargingRecordResponse); diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardLogMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardLogMapper.xml index c6ed722d..13719af5 100644 --- a/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardLogMapper.xml +++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardLogMapper.xml @@ -38,6 +38,7 @@ AND operate = #{operateType} + order by createTime desc LIMIT #{currentPage},#{items}