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

[C端][修改]:订单中增加已付款订单的券码和状态

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
a914fcacc7
2 измененных файлов: 26 добавлений и 3 удалений
  1. +19
    -1
      mallinkService/src/main/java/com/simple/domain/vo/WxOrderCVo.java
  2. +7
    -2
      mallinkService/src/main/resources/mapper/WxOrderMapper.xml

+ 19
- 1
mallinkService/src/main/java/com/simple/domain/vo/WxOrderCVo.java Просмотреть файл

@@ -85,6 +85,13 @@ public class WxOrderCVo extends WxCouponOrder{
private Date updateDate;
/*券ID-产品ID将来的产品都会放在coupon表里**/
@io.swagger.annotations.ApiModelProperty(value="券包中券ID",name="couponOrderId")
private Long couponOrderId;
/*0: 未使用 1: 已核销 2:已过期 3:已退款**/
@io.swagger.annotations.ApiModelProperty(value="0: 未使用 1: 已核销 2:已过期 3:已退款",name="couponOrderStatus")
private Integer couponOrderStatus;
/* 券类型信息 */
/*商户id**/
/*券类型(1.满减券,2.代金券,3.团购券,4.礼品券,5.停车券)**/
@@ -179,7 +186,6 @@ public class WxOrderCVo extends WxCouponOrder{
public Long getCouponId() {
return couponId;
}
public void setCouponId(Long _couponId) {
this.couponId = _couponId;
}
@@ -221,6 +227,18 @@ public class WxOrderCVo extends WxCouponOrder{
updateDate = _updateDate;
}
public Long getCouponOrderId() {
return couponOrderId;
}
public void setCouponOrderId(Long _couponOrderId) {
this.couponOrderId = _couponOrderId;
}
public Integer getCouponOrderStatus() {
return couponOrderStatus;
}
public void setCouponOrderStatus(Integer _couponOrderStatus) {
couponOrderStatus = _couponOrderStatus;
}
public Integer getType() {
return type;


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

@@ -138,7 +138,8 @@
co.type,co.cover_img,co.title,co.sub_title,co.sale_price,co.use_price,co.price,co.detail,co.remark,
m.img_url,m.name,m.link_phone,m.status,
s.addr,s.shop_number,s.baidu_poi,
mb.building_name,mf.floor_name
mb.building_name,mf.floor_name,
c.id as coupon_order_id,c.coupon_order_status
</sql>

<resultMap id="CVoResultMap" type="com.simple.domain.vo.WxOrderCVo">
@@ -167,6 +168,9 @@
<result column="price" jdbcType="INTEGER" property="price" />
<result column="remark" jdbcType="VARCHAR" property="remark" />

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

<result column="img_url" jdbcType="VARCHAR" property="merchantImgUrl" />
<result column="name" jdbcType="VARCHAR" property="merchantName" />
<result column="link_phone" jdbcType="VARCHAR" property="merchantLinkPhone" />
@@ -199,7 +203,8 @@

<select id="selectDetailOfCUser" parameterType="com.simple.domain.po.WxOrder" resultMap="CVoResultMap">
select <include refid="allCUserOrderDetailColumns" />
from wx_order o,wx_coupon co,wx_merchant m
from (wx_order o,wx_coupon co,wx_merchant m)
left join wx_coupon_order c on o.id = c.order_id
left join wx_merchant_shop ms on ms.merchant_id = m.id
left join wx_shop s on ms.shop_id = s.id
left join wx_mall_building mb on s.building = mb.id


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