diff --git a/mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java b/mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java index 8d0ce8953..4ff8f3e6a 100644 --- a/mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java +++ b/mallinkService/src/main/java/com/simple/domain/vo/OrderVo.java @@ -8,49 +8,60 @@ public class OrderVo implements Serializable { /*租户ID**/ @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") private String tenantId; + /*商户ID**/ + @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") + private Long merchantId; /*订单ID**/ @io.swagger.annotations.ApiModelProperty(value="订单ID",name="orderId") private Long orderId; /*卡券ID**/ @io.swagger.annotations.ApiModelProperty(value="卡券ID",name="couponId") private Long couponId; - /*商户ID**/ - @io.swagger.annotations.ApiModelProperty(value="商户ID",name="merchantId") - private Long merchantId; /*c端用户id**/ @io.swagger.annotations.ApiModelProperty(value="c端用户id",name="cUserId") private Long cUserId; + /*b端用户id**/ + @io.swagger.annotations.ApiModelProperty(value="b端用户id",name="bUserId") + private Long bUserId; /*订单状态**/ - @io.swagger.annotations.ApiModelProperty(value="订单状态",name="status") - private Integer status; + @io.swagger.annotations.ApiModelProperty(value="订单状态",name="orderStatus") + private Integer orderStatus; /*券状态**/ @io.swagger.annotations.ApiModelProperty(value="券状态",name="status") private Integer couponStatus; - public String getTenantId() { + public String getTenantId() { return tenantId; } - public void setTenantId(String _tenantId) { - tenantId = _tenantId; + + public void setTenantId(String tenantId) { + this.tenantId = tenantId; } - public Long getOrderId() { - return orderId; + + public Long getMerchantId() { + return merchantId; } - public void setOrderId(Long _orderId) { - orderId = _orderId; + + public void setMerchantId(Long merchantId) { + this.merchantId = merchantId; } - public Long getCouponId() { - return couponId; + + public Long getOrderId() { + return orderId; } - public void setCouponId(Long _couponId) { - couponId = _couponId; + + public void setOrderId(Long orderId) { + this.orderId = orderId; } - public Long getMerchantId() { - return merchantId; + + public Long getCouponId() { + return couponId; } - public void setMerchantId(Long _merchantId) { - merchantId = _merchantId; + + public void setCouponId(Long couponId) { + this.couponId = couponId; } + public Long getcUserId() { return cUserId; } @@ -59,12 +70,20 @@ public class OrderVo implements Serializable { this.cUserId = cUserId; } - public Integer getStatus() { - return status; + public Long getbUserId() { + return bUserId; + } + + public void setbUserId(Long bUserId) { + this.bUserId = bUserId; + } + + public Integer getOrderStatus() { + return orderStatus; } - public void setStatus(Integer status) { - this.status = status; + public void setOrderStatus(Integer orderStatus) { + this.orderStatus = orderStatus; } public Integer getCouponStatus() { diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index d008602fb..0ad1e0fc4 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -98,13 +98,15 @@