Browse Source

fix order

release_toaliyun_real
xiaohanzi 4 years ago
parent
commit
768020acad
2 changed files with 11 additions and 2 deletions
  1. +5
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java
  2. +6
    -2
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

+ 5
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java View File

@@ -103,5 +103,10 @@ public class WxOrderCouponVo extends TenantEntity {


@io.swagger.annotations.ApiModelProperty(value = "补贴额", name = "subsidyNum") @io.swagger.annotations.ApiModelProperty(value = "补贴额", name = "subsidyNum")
private Integer subsidyNum; private Integer subsidyNum;
@io.swagger.annotations.ApiModelProperty(value="组合订单类型EnumComposeOrder",name="composeOrderType")
private Integer composeOrderType;
@io.swagger.annotations.ApiModelProperty(value="组合订单编号",name="composeOrderId")
private Long composeOrderId;


} }

+ 6
- 2
mallinkService/src/main/resources/mapper/WxOrderMapper.xml View File

@@ -253,7 +253,7 @@
<sql id="allCUserOrderDetailColumns"> <sql id="allCUserOrderDetailColumns">
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.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,
c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.detail,c.remark,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date, c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.detail,c.remark,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date,
co.id as coupon_order_id,co.coupon_order_status,c.support_transfer,c.subsidy_num
co.id as coupon_order_id,co.coupon_order_status,c.support_transfer,c.subsidy_num,co.compose_order_type,co.compose_order_id
</sql> </sql>


<update id="updateStatusByPressCouponId" parameterType="com.iformall.domain.po.WxOrder"> <update id="updateStatusByPressCouponId" parameterType="com.iformall.domain.po.WxOrder">
@@ -330,6 +330,9 @@
<result column="coupon_order_status" jdbcType="INTEGER" property="couponOrderStatus"/> <result column="coupon_order_status" jdbcType="INTEGER" property="couponOrderStatus"/>
<result column="send_channel_type" jdbcType="INTEGER" property="sendChannelType" /> <result column="send_channel_type" jdbcType="INTEGER" property="sendChannelType" />
<result column="support_transfer" jdbcType="INTEGER" property="supportTransfer"/> <result column="support_transfer" jdbcType="INTEGER" property="supportTransfer"/>
<result column="compose_order_type" jdbcType="INTEGER" property="composeOrderType" />
<result column="compose_order_id" jdbcType="BIGINT" property="composeOrderId" />


<collection column="{productId=product_id,tenantId=tenant_id}" property="merchantVoList" <collection column="{productId=product_id,tenantId=tenant_id}" property="merchantVoList"
ofType="com.iformall.domain.vo.WxMerchantVo" ofType="com.iformall.domain.vo.WxMerchantVo"
@@ -347,7 +350,8 @@


<sql id="allCUserOrderListColumns"> <sql id="allCUserOrderListColumns">
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.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,
c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date
c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.tail_price,c.orig_price,c.unit,c.valid_start_date,c.valid_end_date,c.pick_start_date,c.pick_end_date,
co.compose_order_type,co.compose_order_id
</sql> </sql>


<select id="findListOfCUser" parameterType="com.iformall.domain.po.WxOrder" resultMap="CVoResultMap"> <select id="findListOfCUser" parameterType="com.iformall.domain.po.WxOrder" resultMap="CVoResultMap">


Loading…
Cancel
Save