diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java index dd72774b9..bd16b9ef4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java @@ -47,4 +47,8 @@ public class WxOrderCouponPressVo extends WxOrder { @io.swagger.annotations.ApiModelProperty(value="商户列表",name="orderPressList") private List orderPressList; + + @io.swagger.annotations.ApiModelProperty(value="组合订单类型EnumComposeOrder",name="composeOrderType") + private Integer composeOrderType; + } diff --git a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml index 5a01072f0..4c55490b3 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml @@ -78,7 +78,8 @@ c.sale_price salePrice,c.cover_img coverImg,g.remain_people remainPeople,c.id couponId,g.expired_date expiredDate,g.status,g.user_id firstUser,u.nick_name nickName,u.avatar_url avatarUrl,o.tenant_id tenantId,o.parent_tenant_id parentTenantId, o.coupon_channel_id couponChannelId,c.press_limit_num pressLimitNum, - (select status from wx_coupon_channel where id=o.coupon_channel_id) couponStatus + (select status from wx_coupon_channel where id=o.coupon_channel_id) couponStatus, + o.compose_order_type composeOrderType from wx_order o left join wx_coupon c on o.product_id=c.id left join wx_order_group g on o.order_group_id=g.id diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 37482d221..3cebd6098 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -897,6 +897,8 @@ + + @@ -944,7 +946,8 @@ o.id,o.order_number,o.tenant_id,o.parent_tenant_id,o.c_user_id,o.coupon_channel_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status, o.create_date,o.update_date,o.press_end_date,o.press_current_num,o.press_current_value, - c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.press_limit_num + c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.press_limit_num, + o.compose_order_type