xhxu 3 лет назад
Родитель
Сommit
0767a036e8
2 измененных файлов: 18 добавлений и 13 удалений
  1. +10
    -7
      mallinkService/src/main/java/com/iformall/domain/po/BusinessCircleBase.java
  2. +8
    -6
      mallinkService/src/main/java/com/iformall/domain/vo/WxThirdPartyOrdersVo.java

+ 10
- 7
mallinkService/src/main/java/com/iformall/domain/po/BusinessCircleBase.java Просмотреть файл

@@ -27,6 +27,7 @@ public class BusinessCircleBase extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="商圈支付结果通知类型:MALL_TRANSACTION.SUCCESS",name="noticeEventType")
private String noticeEventType;

@Excel(name = "通知时间", width = 20, orderNum = "12")
@io.swagger.annotations.ApiModelProperty(value="商圈支付结果通知回调摘要",name="summary")
private String summary;

@@ -61,7 +62,7 @@ public class BusinessCircleBase extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="支付订单号",name="transactionId")
private String transactionId;

@Excel(name = "通知时间", width = 20, orderNum = "8", format = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "通知时间", width = 20, orderNum = "11", format = "yyyy-MM-dd HH:mm:ss")
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime")
private Date createTime;

@@ -75,7 +76,7 @@ public class BusinessCircleBase extends TenantEntity {
@TableField(exist = false)
private WxMerchant merchant;

@Excel(name = "会员ID", width = 20, orderNum = "6")
@Excel(name = "会员ID", width = 20, orderNum = "9")
@TableField(exist = false)
private String userIdStr;
public String getUserIdStr(){
@@ -84,7 +85,7 @@ public class BusinessCircleBase extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="c端会员id,与第三方对齐",name="cUserId")
private Long cUserId;
private String cUserNickName;
@Excel(name = "会员手机号", width = 20, orderNum = "7")
@Excel(name = "会员手机号", width = 20, orderNum = "10")
@TableField(exist = false)
private String userPhoneStr;
public String getUserPhoneStr(){
@@ -94,25 +95,26 @@ public class BusinessCircleBase extends TenantEntity {
@TableField(exist = false)
private WxCUserBasicInfo basicInfo;

@Excel(name = "是否获得积分", width = 20, orderNum = "9", replace = {"是_1", "否_0"})
@Excel(name = "积分是否变动", width = 20, orderNum = "13", replace = {"是_1", "否_0"})
@io.swagger.annotations.ApiModelProperty(value="是否获得积分(1:是,0:否)",name="earnPoints")
private Integer earnPoints;

@Excel(name = "更新积分值", width = 20, orderNum = "10")
@Excel(name = "积分变动值", width = 20, orderNum = "14")
@io.swagger.annotations.ApiModelProperty(value="订单更新积分值",name="increasedPoints")
private Integer increasedPoints;

@Excel(name = "积分更新时间", width = 20, orderNum = "11", format = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "积分更新时间", width = 20, orderNum = "15", format = "yyyy-MM-dd HH:mm:ss")
@io.swagger.annotations.ApiModelProperty(value="积分更新时间(新增)",name="increasedPoints")
private Date pointsUpdateTime;

@Excel(name = "是否退款", width = 20, orderNum = "12", replace = {"是_1", "_0"})
@Excel(name = "是否退款", width = 20, orderNum = "6", replace = {"退款订单_1", "付款订单_0"})
@io.swagger.annotations.ApiModelProperty(value="是否退款(1:是,0:否)",name="isRefund")
private Integer isRefund;

@io.swagger.annotations.ApiModelProperty(value="正常订单状态(is_refund=0时)1:部分退款2:订单关闭",name="orderStatus")
private Integer orderStatus;

@Excel(name = "退款订单号", width = 20, orderNum = "7")
@io.swagger.annotations.ApiModelProperty(value="微信支付退款单号",name="refundId")
private String refundId;

@@ -127,6 +129,7 @@ public class BusinessCircleBase extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="用户退款金额,单位(分)",name="refundAmount")
private Integer refundAmount;

@Excel(name = "退款金额(元)", width = 20, orderNum = "8")
@TableField(exist = false)
@io.swagger.annotations.ApiModelProperty(value="用户退款金额,单位(元)",name="refundAmountStr")
private String refundAmountStr;


+ 8
- 6
mallinkService/src/main/java/com/iformall/domain/vo/WxThirdPartyOrdersVo.java Просмотреть файл

@@ -31,11 +31,11 @@ public class WxThirdPartyOrdersVo extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="商圈支付结果通知类型:MALL_TRANSACTION.SUCCESS",name="noticeEventType")
private String noticeEventType;

@Excel(name = "摘要", width = 20, orderNum = "8")
@Excel(name = "摘要", width = 20, orderNum = "10")
@io.swagger.annotations.ApiModelProperty(value="商圈支付结果通知回调摘要",name="summary")
private String summary;

@Excel(name = "抵扣时间", width = 20, orderNum = "4", format = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "抵扣/退款时间", width = 20, orderNum = "6", format = "yyyy-MM-dd HH:mm:ss")
@io.swagger.annotations.ApiModelProperty(value="交易完成时间",name="timeEnd")
private Date timeEnd;

@@ -50,7 +50,7 @@ public class WxThirdPartyOrdersVo extends TenantEntity {
return amount != null ? new BigDecimal(amount).divide(new BigDecimal(100)).toPlainString(): amountStr;
}

@Excel(name = "积分数量", width = 20, orderNum = "5")
@Excel(name = "积分数量", width = 20, orderNum = "7")
@io.swagger.annotations.ApiModelProperty(value="用户实际付款金额,单位(分)",name="payAmount")
private Integer payAmount;

@@ -62,7 +62,7 @@ public class WxThirdPartyOrdersVo extends TenantEntity {
return payAmount != null ? new BigDecimal(payAmount).divide(new BigDecimal(100)).toPlainString(): payAmountStr;
}

@Excel(name = "订单编号", width = 20, orderNum = "3")
@Excel(name = "付款订单编号", width = 20, orderNum = "3")
@io.swagger.annotations.ApiModelProperty(value="支付订单号",name="transactionId")
private String transactionId;

@@ -79,7 +79,7 @@ public class WxThirdPartyOrdersVo extends TenantEntity {
@TableField(exist = false)
private WxMerchant merchant;

@Excel(name = "会员ID", width = 20, orderNum = "6")
@Excel(name = "会员ID", width = 20, orderNum = "8")
@TableField(exist = false)
private String userIdStr;
public String getUserIdStr(){
@@ -88,7 +88,7 @@ public class WxThirdPartyOrdersVo extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="c端会员id,与第三方对齐",name="cUserId")
private Long cUserId;
private String cUserNickName;
@Excel(name = "会员手机号", width = 20, orderNum = "7")
@Excel(name = "会员手机号", width = 20, orderNum = "9")
@TableField(exist = false)
private String userPhoneStr;
public String getUserPhoneStr(){
@@ -107,12 +107,14 @@ public class WxThirdPartyOrdersVo extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="积分更新时间(新增)",name="increasedPoints")
private Date pointsUpdateTime;

@Excel(name = "是否退款", width = 20, orderNum = "4", replace = {"退款订单_1", "付款订单_0"})
@io.swagger.annotations.ApiModelProperty(value="是否退款(1:是,0:否)",name="isRefund")
private Integer isRefund;

@io.swagger.annotations.ApiModelProperty(value="正常订单状态(is_refund=0时)1:部分退款2:订单关闭",name="orderStatus")
private Integer orderStatus;

@Excel(name = "退款订单编号", width = 20, orderNum = "5")
@io.swagger.annotations.ApiModelProperty(value="微信支付退款单号",name="refundId")
private String refundId;



Загрузка…
Отмена
Сохранить