Ver a proveniência

update

release_toaliyun_real
xhxu há 5 anos
ascendente
cometimento
9f46c0dfac
2 ficheiros alterados com 8 adições e 1 eliminações
  1. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
  2. +5
    -1
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java Ver ficheiro

@@ -106,6 +106,9 @@ public class WxCouponOrderBVo extends WxCouponOrder {
@io.swagger.annotations.ApiModelProperty(value = "补贴类型", name = "subsidyType") @io.swagger.annotations.ApiModelProperty(value = "补贴类型", name = "subsidyType")
private Integer subsidyType; private Integer subsidyType;


@io.swagger.annotations.ApiModelProperty(value="1:A端发卷,2:B端发卷",name="sourceType")
private Integer sourceType;

public String getbUserName() { public String getbUserName() {
return bUserName; return bUserName;
} }


+ 5
- 1
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml Ver ficheiro

@@ -720,6 +720,7 @@
<result column="business" jdbcType="INTEGER" property="business"/> <result column="business" jdbcType="INTEGER" property="business"/>
<result column="subsidy_num" jdbcType="INTEGER" property="subsidyNum"/> <result column="subsidy_num" jdbcType="INTEGER" property="subsidyNum"/>
<result column="subsidy_type" jdbcType="INTEGER" property="subsidyType"/> <result column="subsidy_type" jdbcType="INTEGER" property="subsidyType"/>
<result column="source_type" jdbcType="INTEGER" property="sourceType"/>


<result column="name" jdbcType="VARCHAR" property="bUserName" /> <result column="name" jdbcType="VARCHAR" property="bUserName" />
<result column="bphone" jdbcType="VARCHAR" property="bUserPhone" /> <result column="bphone" jdbcType="VARCHAR" property="bUserPhone" />
@@ -749,7 +750,7 @@


co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status, co.id,co.tenant_id,co.parent_tenant_id,co.coupon_id,co.coupon_type,co.expired_time,co.coupon_order_status,
co.create_date,co.update_date,co.coupon_price, co.verify_type, co.pay_vendor,c.title,c.sale_price,c.use_price,c.price, co.create_date,co.update_date,co.coupon_price, co.verify_type, co.pay_vendor,c.title,c.sale_price,c.use_price,c.price,
c.unit,c.auto_refund,c.business,c.subsidy_type,ms.subsidy subsidy_num,
c.unit,c.auto_refund,c.business,c.subsidy_type,c.source_type,ms.subsidy subsidy_num,
(CASE WHEN couc.mc = 1 THEN m1.name ELSE '[多商户通用]' END) AS merchant_name, (CASE WHEN couc.mc = 1 THEN m1.name ELSE '[多商户通用]' END) AS merchant_name,
(CASE WHEN couc.mc = 1 THEN m1.id ELSE 0 END) AS merchant_id, (CASE WHEN couc.mc = 1 THEN m1.id ELSE 0 END) AS merchant_id,
cu.phone,m2.name AS verify_merchant_name,cal.channel_type cu.phone,m2.name AS verify_merchant_name,cal.channel_type
@@ -854,6 +855,9 @@
<if test=" null != business "> <if test=" null != business ">
and c.business = #{business} and c.business = #{business}
</if> </if>
<if test=" null != sourceType ">
and c.`source_type` = #{sourceType}
</if>
<if test=" null != verifyMerchantName and ''!= verifyMerchantName "> <if test=" null != verifyMerchantName and ''!= verifyMerchantName ">
and bu.verify_merchant_name = #{verifyMerchantName} and bu.verify_merchant_name = #{verifyMerchantName}
</if> </if>


Carregando…
Cancelar
Guardar