Просмотр исходного кода

/。订单详情

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
3ce3e39d46
2 измененных файлов: 7 добавлений и 5 удалений
  1. +0
    -3
      mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java
  2. +7
    -2
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

+ 0
- 3
mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java Просмотреть файл

@@ -48,7 +48,4 @@ 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;
}

+ 7
- 2
mallinkService/src/main/resources/mapper/WxOrderMapper.xml Просмотреть файл

@@ -987,7 +987,8 @@

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

<result column="compose_order_id" jdbcType="BIGINT" property="composeOrderId"/>
<result column="compose_order_type" jdbcType="INTEGER" property="composeOrderType"/>

<result column="shipping_type" jdbcType="INTEGER" property="shippingType"/>
@@ -1030,6 +1031,9 @@
<result column="coupon_order_id" jdbcType="BIGINT" property="couponOrderId"/>
<result column="coupon_order_status" jdbcType="INTEGER" property="couponOrderStatus"/>

<result column="compose_order_id" jdbcType="BIGINT" property="composeOrderId"/>
<result column="compose_order_type" jdbcType="INTEGER" property="composeOrderType"/>

<!-- <collection column="{orderId=order_number,tenantId=tenant_id}" property="orderPressList"
ofType="com.iformall.domain.vo.WxOrderPressVo"
javaType="java.util.List"
@@ -1041,12 +1045,13 @@
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.`freight_price`,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,
o.compose_order_type,o.`shipping_type`,o.`shipping_address`
o.compose_order_id,o.compose_order_type,o.`shipping_type`,o.`shipping_address`
</sql>

<sql id="allOrderPressDetailColumns">
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.`freight_price`,o.order_status,
o.create_date,o.update_date,o.press_end_date,o.press_current_num,o.press_current_value,
o.compose_order_id,o.compose_order_type,
c.type as coupon_type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.detail,c.remark,c.press_limit_num,
co.id as coupon_order_id,co.coupon_order_status
</sql>


Загрузка…
Отмена
Сохранить