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

wx_coupon_order add

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
91fa95119c
2 измененных файлов: 36 добавлений и 3 удалений
  1. +23
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponVo.java
  2. +13
    -3
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

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

@@ -2,10 +2,12 @@ package com.iformall.domain.vo;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.iformall.common.SortColumn;
import com.iformall.domain.po.base.TenantEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

@@ -109,4 +111,25 @@ public class WxOrderCouponVo extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="组合订单编号",name="composeOrderId")
private Long composeOrderId;


@io.swagger.annotations.ApiModelProperty(value="运费",name="freightPrice")
private Integer freightPrice;

@TableField(exist = false)
@SortColumn(column = "freight_price")
private String freightPriceStr;

public String getFreightPriceStr() {
if(freightPrice!=null) {
freightPriceStr = new BigDecimal(freightPrice).divide(new BigDecimal(100)).toString();
}
return freightPriceStr;
}

@io.swagger.annotations.ApiModelProperty(value="收货地址",name="shippingAddress")
private String shippingAddress;

@io.swagger.annotations.ApiModelProperty(value="配送类型 0:默认(无) 1:自提 2:配送",name="shippingType")
private Integer shippingType;

}

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

@@ -1268,9 +1268,19 @@
<!-- left join wx_coupon_action_log cal on cal.coupon_order_id = co.id -->
where 1=1
and co.coupon_id = c.id
and co.coupon_type != 5
and co.coupon_type != 51
and co.coupon_type &lt; 100
<choose>
<when test=" null != couponType">
and co.coupon_type = #{couponType}
</when>
<otherwise>
and co.coupon_type != 5
and co.coupon_type != 11
and co.coupon_type != 12
and co.coupon_type != 51
and co.coupon_type &lt; 100
</otherwise>
</choose>

<if test="cUserId != null">
and co.c_user_id = #{cUserId}
</if>


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