Przeglądaj źródła

[订单详情及券频道][修改][添加可转赠字段]

release_toaliyun_real
gongbiao 7 lat temu
committed by Stormeye Wu
rodzic
commit
fab25a1b7e
4 zmienionych plików z 37 dodań i 3 usunięć
  1. +11
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponChannelVo.java
  2. +20
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java
  3. +4
    -2
      mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml
  4. +2
    -1
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

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

@@ -67,6 +67,9 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable {
@Transient @Transient
private Integer gameWeight; private Integer gameWeight;


@io.swagger.annotations.ApiModelProperty(value = "是否可转赠", name = "supportTransfer")
private Integer supportTransfer;

public Integer getGameWeight() { public Integer getGameWeight() {
return gameWeight; return gameWeight;
} }
@@ -195,4 +198,12 @@ public class WxCouponChannelVo extends WxCouponChannel implements Serializable {
public void setMerchantVoList(List<WxMerchantVo> merchantVoList) { public void setMerchantVoList(List<WxMerchantVo> merchantVoList) {
this.merchantVoList = merchantVoList; this.merchantVoList = merchantVoList;
} }

public Integer getSupportTransfer() {
return supportTransfer;
}

public void setSupportTransfer(Integer supportTransfer) {
this.supportTransfer = supportTransfer;
}
} }

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

@@ -111,6 +111,10 @@ public class WxOrderCouponVo {
@io.swagger.annotations.ApiModelProperty(value="卡券来源",name="sendChannelType") @io.swagger.annotations.ApiModelProperty(value="卡券来源",name="sendChannelType")
private Integer sendChannelType; private Integer sendChannelType;


@io.swagger.annotations.ApiModelProperty(value = "是否可转赠", name = "supportTransfer")
private Integer supportTransfer;


public Long getOrderNumber() { public Long getOrderNumber() {
return orderNumber; return orderNumber;
} }
@@ -272,4 +276,20 @@ public class WxOrderCouponVo {
public void setSendChannelType(Integer sendChannelType) { public void setSendChannelType(Integer sendChannelType) {
this.sendChannelType = sendChannelType; this.sendChannelType = sendChannelType;
} }

public Long getcUserId() {
return cUserId;
}

public void setcUserId(Long cUserId) {
this.cUserId = cUserId;
}

public Integer getSupportTransfer() {
return supportTransfer;
}

public void setSupportTransfer(Integer supportTransfer) {
this.supportTransfer = supportTransfer;
}
} }

+ 4
- 2
mallinkService/src/main/resources/mapper/WxCouponChannelMapper.xml Wyświetl plik

@@ -106,7 +106,7 @@


<sql id="CouponChannelVoColumns"> <sql id="CouponChannelVoColumns">
<include refid="allColumns" />, <include refid="allColumns" />,
c.remain_inventory,c.inventory,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.use_limit_quantity,c.send_type
c.remain_inventory,c.inventory,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.use_limit_quantity,c.send_type,c.support_transfer
</sql> </sql>


<resultMap id="CouponChannelVoMap" type="com.iformall.domain.vo.WxCouponChannelVo"> <resultMap id="CouponChannelVoMap" type="com.iformall.domain.vo.WxCouponChannelVo">
@@ -132,7 +132,9 @@
<result column="unit" jdbcType="INTEGER" property="unit"/> <result column="unit" jdbcType="INTEGER" property="unit"/>
<result column="use_limit_quantity" jdbcType="INTEGER" property="useLimitQuantity"/> <result column="use_limit_quantity" jdbcType="INTEGER" property="useLimitQuantity"/>
<result column="send_type" jdbcType="INTEGER" property="sendType"/> <result column="send_type" jdbcType="INTEGER" property="sendType"/>

<result column="support_transfer" jdbcType="INTEGER" property="supportTransfer"/>
<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"


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

@@ -169,7 +169,7 @@
<sql id="allCUserOrderDetailColumns"> <sql id="allCUserOrderDetailColumns">
o.id,o.order_number,o.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.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.unit,c.detail,c.remark, c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,c.detail,c.remark,
co.id as coupon_order_id,co.coupon_order_status
co.id as coupon_order_id,co.coupon_order_status,c.support_transfer
</sql> </sql>


<update id="updateStatusByPressCouponId" parameterType="com.iformall.domain.po.WxOrder"> <update id="updateStatusByPressCouponId" parameterType="com.iformall.domain.po.WxOrder">
@@ -210,6 +210,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" /> <result column="send_channel_type" jdbcType="INTEGER" property="sendChannelType" />
<result column="support_transfer" jdbcType="INTEGER" property="supportTransfer"/>


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


Ładowanie…
Anuluj
Zapisz