diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java
index 3a81895a0..2ffe8bc65 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponOrder.java
@@ -47,9 +47,15 @@ public class WxCouponOrder implements Serializable {
/*单张券ID**/
@io.swagger.annotations.ApiModelProperty(value = "单张券ID", name = "couponId")
private Long couponId;
+ /**券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,7.类储值卡) */
+ @io.swagger.annotations.ApiModelProperty(value = "券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券,6.多商户券,7.类储值卡)", name = "couponType")
+ private Integer couponType;
/*c端用户id**/
@io.swagger.annotations.ApiModelProperty(value = "c端用户id", name = "cUserId")
private Long cUserId;
+ /**持有者ID*/
+ @io.swagger.annotations.ApiModelProperty(value = "持有者ID", name = "ownerId")
+ private Long ownerId;
/*操作券B端小程序用户ID**/
@io.swagger.annotations.ApiModelProperty(value = "操作券B端小程序用户ID", name = "bUserId")
private Long bUserId;
@@ -138,6 +144,14 @@ public class WxCouponOrder implements Serializable {
couponId = _couponId;
}
+ public Integer getCouponType() {
+ return couponType;
+ }
+
+ public void setCouponType(Integer couponType) {
+ this.couponType = couponType;
+ }
+
public Long getCUserId() {
return cUserId;
}
@@ -146,6 +160,14 @@ public class WxCouponOrder implements Serializable {
cUserId = _cUserId;
}
+ public Long getOwnerId() {
+ return ownerId;
+ }
+
+ public void setOwnerId(Long ownerId) {
+ this.ownerId = ownerId;
+ }
+
public Long getBUserId() {
return bUserId;
}
@@ -204,26 +226,18 @@ public class WxCouponOrder implements Serializable {
public static enum Field {
Id_ASC("`id` ASC"), Id_DESC("`id` DESC"),
- TenantId_ASC("`tenant_id` ASC"),
- TenantId_DESC("`tenant_id` DESC"),
- CouponId_ASC("`coupon_id` ASC"),
- CouponId_DESC("`coupon_id` DESC"),
- CUserId_ASC("`c_user_id` ASC"),
- CUserId_DESC("`c_user_id` DESC"),
- BUserId_ASC("`b_user_id` ASC"),
- BUserId_DESC("`b_user_id` DESC"),
- OrderId_ASC("`order_id` ASC"),
- OrderId_DESC("`order_id` DESC"),
- ExpiredTime_ASC("`expired_time` ASC"),
- ExpiredTime_DESC("`expired_time` DESC"),
- CouponOrderStatus_ASC("`coupon_order_status` ASC"),
- CouponOrderStatus_DESC("`coupon_order_status` DESC"),
- CreateDate_ASC("`create_date` ASC"),
- CreateDate_DESC("`create_date` DESC"),
- UpdateDate_ASC("`update_date` ASC"),
- UpdateDate_DESC("`update_date` DESC"),
- CouponPrice_ASC("`coupon_price` ASC"),
- CouponPrice_DESC("`coupon_price` DESC");
+ TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"),
+ CouponId_ASC("`coupon_id` ASC"), CouponId_DESC("`coupon_id` DESC"),
+ CouponType_ASC("`coupon_type` ASC"), CouponType_DESC("`coupon_type` DESC"),
+ CUserId_ASC("`c_user_id` ASC"), CUserId_DESC("`c_user_id` DESC"),
+ OwnerId_ASC("`owner_id` ASC"), OwnerId_DESC("`owner_id` DESC"),
+ BUserId_ASC("`b_user_id` ASC"), BUserId_DESC("`b_user_id` DESC"),
+ OrderId_ASC("`order_id` ASC"), OrderId_DESC("`order_id` DESC"),
+ ExpiredTime_ASC("`expired_time` ASC"), ExpiredTime_DESC("`expired_time` DESC"),
+ CouponOrderStatus_ASC("`coupon_order_status` ASC"), CouponOrderStatus_DESC("`coupon_order_status` DESC"),
+ CreateDate_ASC("`create_date` ASC"), CreateDate_DESC("`create_date` DESC"),
+ UpdateDate_ASC("`update_date` ASC"), UpdateDate_DESC("`update_date` DESC"),
+ CouponPrice_ASC("`coupon_price` ASC"), CouponPrice_DESC("`coupon_price` DESC");
private String value;
Field(String value) {
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
index a6a7716a1..207c85efd 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
@@ -479,7 +479,9 @@ public class WxOrderServiceImpl implements WxOrderService {
couponOrder.setId(idWorker.nextId());
couponOrder.setTenantId(user.getTenantId());
couponOrder.setCouponId(order.getProductId());
+ couponOrder.setCouponType(coupon.getType());
couponOrder.setCUserId(user.getId());
+ couponOrder.setOwnerId(user.getId());
couponOrder.setOrderId(order.getOrderNumber());
couponOrder.setExpiredTime(valid_date);
couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode());
diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
index e52afdccb..3c6163a3d 100644
--- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
@@ -5,7 +5,9 @@
+
+
@@ -16,7 +18,7 @@
- `id`,`tenant_id`,`coupon_id`,`c_user_id`,`b_user_id`,`order_id`,`expired_time`,`coupon_order_status`,`create_date`,`update_date`,`coupon_price`
+ `id`,`tenant_id`,`coupon_id`,`coupon_type`,`c_user_id`,`owner_id`,`b_user_id`,`order_id`,`expired_time`,`coupon_order_status`,`create_date`,`update_date`,`coupon_price`
@@ -34,10 +36,18 @@
and `coupon_id` = #{couponId}
+
+ and `coupon_type` = #{couponType}
+
+
and `c_user_id` = #{cUserId}
+
+ and `owner_id` = #{ownerId}
+
+
and `b_user_id` = #{bUserId}
@@ -293,7 +303,9 @@
+
+
@@ -321,13 +333,13 @@
- co.id,co.tenant_id,co.coupon_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,
+ co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,
c.title,c.sale_price,c.use_price,c.price,c.unit,
m.name as merchant_name
- co.id,co.tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,
+ co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,
c.type,c.title,c.sale_price,c.use_price,c.price,c.unit,
bu.name, bu.phone as bphone,
cu.phone,
@@ -398,14 +410,14 @@
- co.id,co.tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,
+ co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,
c.type,c.title,c.sale_price,c.use_price,c.price,c.unit,
bu.name,
cu.phone
- co.id,co.tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,
+ co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,
c.type,c.title,c.sale_price,c.use_price,c.price,c.unit,
cu.phone
@@ -453,7 +465,7 @@
- co.id,co.tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price
+ co.id,co.tenant_id,co.coupon_id,co.coupon_type,co.c_user_id,co.owner_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price