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

[C端][修复]:显示券的来源

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
0b2644ecbe
4 измененных файлов: 34 добавлений и 6 удалений
  1. +10
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderCVo.java
  2. +10
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java
  3. +7
    -3
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml
  4. +7
    -3
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

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

@@ -119,6 +119,10 @@ public class WxCouponOrderCVo extends WxCouponOrder {
@io.swagger.annotations.ApiModelProperty(value="商户名",name="name") @io.swagger.annotations.ApiModelProperty(value="商户名",name="name")
private String merchantName; private String merchantName;


/*卡券来源**/
@io.swagger.annotations.ApiModelProperty(value="卡券来源",name="sendChannelType")
private Integer sendChannelType;

/*发券商户信息*/ /*发券商户信息*/
@io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList")
private List<WxMerchantVo> merchantVoList; private List<WxMerchantVo> merchantVoList;
@@ -269,5 +273,11 @@ public class WxCouponOrderCVo extends WxCouponOrder {
merchantName = _name; merchantName = _name;
} }


public Integer getSendChannelType() {
return sendChannelType;
}


public void setSendChannelType(Integer sendChannelType) {
this.sendChannelType = sendChannelType;
}
} }

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

@@ -104,6 +104,9 @@ public class WxOrderCouponVo {
@io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList") @io.swagger.annotations.ApiModelProperty(value="商户列表",name="merchantVoList")
private List<WxMerchantVo> merchantVoList; private List<WxMerchantVo> merchantVoList;


/*卡券来源**/
@io.swagger.annotations.ApiModelProperty(value="卡券来源",name="sendChannelType")
private Integer sendChannelType;


public Long getOrderNumber() { public Long getOrderNumber() {
return orderNumber; return orderNumber;
@@ -251,4 +254,11 @@ public class WxOrderCouponVo {
remark = _remark; remark = _remark;
} }


public Integer getSendChannelType() {
return sendChannelType;
}

public void setSendChannelType(Integer sendChannelType) {
this.sendChannelType = sendChannelType;
}
} }

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

@@ -507,8 +507,9 @@


<sql id="allCUserCouponOrderListColumns"> <sql id="allCUserCouponOrderListColumns">
co.id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, co.id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,
c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit
</sql>
c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,
cal.channel_type as send_channel_type
</sql>


<sql id="allCUserCouponOrderDetailColumns"> <sql id="allCUserCouponOrderDetailColumns">
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, 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,
@@ -541,6 +542,8 @@
<result column="unit" jdbcType="INTEGER" property="unit" /> <result column="unit" jdbcType="INTEGER" property="unit" />
<result column="remark" jdbcType="VARCHAR" property="remark" /> <result column="remark" jdbcType="VARCHAR" property="remark" />


<result column="send_channel_type" jdbcType="INTEGER" property="sendChannelType" />

<collection column="{productId=coupon_id}" property="merchantVoList" <collection column="{productId=coupon_id}" property="merchantVoList"
ofType="com.iformall.domain.vo.WxMerchantVo" ofType="com.iformall.domain.vo.WxMerchantVo"
javaType="java.util.List" javaType="java.util.List"
@@ -551,7 +554,8 @@


<select id="findListOfCUser" parameterType="com.iformall.domain.vo.WxCouponOrderCVo" resultMap="CVoResultMap"> <select id="findListOfCUser" parameterType="com.iformall.domain.vo.WxCouponOrderCVo" resultMap="CVoResultMap">
select <include refid="allCUserCouponOrderListColumns" /> select <include refid="allCUserCouponOrderListColumns" />
from wx_coupon_order co,wx_coupon c
from wx_coupon c,wx_coupon_order co
left join wx_coupon_action_log cal on cal.coupon_order_id = co.id
where 1=1 where 1=1
and co.coupon_id = c.id and co.coupon_id = c.id
and co.coupon_type != 5 and co.coupon_type != 7 and co.coupon_type != 5 and co.coupon_type != 7


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

@@ -133,7 +133,8 @@


<sql id="allCUserOrderListColumns"> <sql id="allCUserOrderListColumns">
o.id,o.order_number,o.tenant_id,o.c_user_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.c_user_id,o.product_id,o.payment_type,o.payment,o.payment_time,o.order_status,o.create_date,o.update_date,
c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit
c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,
cal.channel_type as send_channel_type
</sql> </sql>




@@ -170,6 +171,7 @@


<result column="coupon_order_id" jdbcType="BIGINT" property="couponOrderId"/> <result column="coupon_order_id" jdbcType="BIGINT" property="couponOrderId"/>
<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" />


<collection column="{productId=product_id}" property="merchantVoList" <collection column="{productId=product_id}" property="merchantVoList"
ofType="com.iformall.domain.vo.WxMerchantVo" ofType="com.iformall.domain.vo.WxMerchantVo"
@@ -181,8 +183,10 @@
<select id="findListOfCUser" parameterType="com.iformall.domain.po.WxOrder" resultMap="CVoResultMap"> <select id="findListOfCUser" parameterType="com.iformall.domain.po.WxOrder" resultMap="CVoResultMap">
select select
<include refid="allCUserOrderListColumns"/> <include refid="allCUserOrderListColumns"/>
from wx_order o,wx_coupon c
where o.product_id = c.id
from wx_order o,wx_coupon c,wx_coupon_order co
left join wx_coupon_action_log cal on cal.coupon_order_id = co.id
where co.order_id = o.id
and o.product_id = c.id
<if test="cUserId != null"> <if test="cUserId != null">
and o.c_user_id = #{cUserId} and o.c_user_id = #{cUserId}
</if> </if>


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