|
|
|
@@ -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; |
|
|
|
|