Przeglądaj źródła

fix order

release_toaliyun_real
xiaohanzi 4 lat temu
rodzic
commit
c5ffc6f6b9
3 zmienionych plików z 10 dodań i 2 usunięć
  1. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java
  2. +2
    -1
      mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml
  3. +4
    -1
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java Wyświetl plik

@@ -47,4 +47,8 @@ public class WxOrderCouponPressVo extends WxOrder {

@io.swagger.annotations.ApiModelProperty(value="商户列表",name="orderPressList")
private List<WxOrderPressVo> orderPressList;
@io.swagger.annotations.ApiModelProperty(value="组合订单类型EnumComposeOrder",name="composeOrderType")
private Integer composeOrderType;
}

+ 2
- 1
mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml Wyświetl plik

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


+ 4
- 1
mallinkService/src/main/resources/mapper/WxOrderMapper.xml Wyświetl plik

@@ -897,6 +897,8 @@

<result column="coupon_order_id" jdbcType="BIGINT" property="couponOrderId"/>
<result column="coupon_order_status" jdbcType="INTEGER" property="couponOrderStatus"/>
<result column="compose_order_type" jdbcType="INTEGER" property="composeOrderType"/>
</resultMap>

<resultMap id="PressVoDetailResultMap" type="com.iformall.domain.vo.WxOrderCouponPressVo">
@@ -944,7 +946,8 @@
<sql id="allOrderPressListColumns">
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
</sql>

<sql id="allOrderPressDetailColumns">


Ładowanie…
Anuluj
Zapisz