diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderPayRecord.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderPayRecord.java index 3f2089e8c..3853a99f7 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderPayRecord.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderPayRecord.java @@ -35,6 +35,11 @@ public class OrderPayRecord { */ private BigDecimal payAmount; + /** + * 支付id + */ + private String paymentId; + /** * 收单机构(0-本账户余额;1-微信支付;2-汇付支付) */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPayRecordMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPayRecordMapper.java index 927f0407e..a45433862 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPayRecordMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderPayRecordMapper.java @@ -38,9 +38,5 @@ public interface OrderPayRecordMapper { int insertOrUpdateSelective(OrderPayRecord record); - // int deleteByPrimaryKey(Integer id); - - // int updateByPrimaryKey(OrderPayRecord record); - List getOrderPayRecordList(@Param("orderCode") String orderCode); } \ No newline at end of file diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java index df7165048..b42f5ff48 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderPayRecordServiceImpl.java @@ -5,7 +5,9 @@ import com.alibaba.fastjson2.JSONArray; import com.google.common.collect.Lists; import com.jsowell.adapay.vo.PaymentInfo; import com.jsowell.common.constant.CacheConstants; +import com.jsowell.common.constant.Constants; import com.jsowell.common.core.redis.RedisCache; +import com.jsowell.common.core.text.Convert; import com.jsowell.common.enums.ykc.OrderPayModeEnum; import com.jsowell.common.enums.ykc.OrderPayRecordEnum; import com.jsowell.common.enums.ykc.PaymentInstitutionsEnum; @@ -106,10 +108,10 @@ public class OrderPayRecordServiceImpl implements OrderPayRecordService { for (OrderPayRecord orderPayRecord : orderPayRecordList) { OrderDetailInfoVO.PayRecord payInfo = new OrderDetailInfoVO.PayRecord(); - payInfo.setPayAmount(orderPayRecord.getPayAmount().toString()); + payInfo.setPayAmount(Convert.toStr(orderPayRecord.getPayAmount(), Constants.ZERO)); payInfo.setPayStatus(orderBasicInfo.getPayStatus()); payInfo.setPayTime(DateUtils.formatDateTime(orderBasicInfo.getPayTime())); - payInfo.setRefundAmount(String.valueOf(orderPayRecord.getRefundAmount())); + payInfo.setRefundAmount(Convert.toStr(orderPayRecord.getRefundAmount(), Constants.ZERO)); // 支付方式(1-本金余额支付;2-赠送余额支付;3-白名单支付;4-微信支付;5-支付宝支付) String payMode = orderPayRecord.getPayMode(); diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderPayRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderPayRecordMapper.xml index 572bcaba8..02baec5a8 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderPayRecordMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderPayRecordMapper.xml @@ -8,6 +8,7 @@ + @@ -19,7 +20,7 @@ - id, order_code, pay_mode, pay_amount, acquirer, refund_amount, deduction_record, + id, order_code, pay_mode, pay_amount, payment_id, acquirer, refund_amount, deduction_record, create_by, create_time, update_by, update_time, del_flag