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

update gift

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
fc8ce9ce68
2 измененных файлов: 7 добавлений и 4 удалений
  1. +4
    -4
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
  2. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java

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

@@ -21,7 +21,7 @@ public class WxCouponOrderBVo extends WxCouponOrder {


private static final long serialVersionUID = 6687954932922444531L; private static final long serialVersionUID = 6687954932922444531L;


@Excel(name = "码", width = 20, orderNum = "1", prefix = "`")
@Excel(name = "兑换码", width = 20, orderNum = "1", prefix = "`")
protected Long id; protected Long id;


/** 基础购买到的券信息 */ /** 基础购买到的券信息 */
@@ -32,7 +32,7 @@ public class WxCouponOrderBVo extends WxCouponOrder {
@io.swagger.annotations.ApiModelProperty(value = "该订单对应券的实际过期时间 ", name = "expiredTime") @io.swagger.annotations.ApiModelProperty(value = "该订单对应券的实际过期时间 ", name = "expiredTime")
private Date expiredTime; private Date expiredTime;


@Excel(name = "券名称", width = 50, orderNum = "2")
@Excel(name = "券/商品名称", width = 50, orderNum = "2")
@io.swagger.annotations.ApiModelProperty(value="券名称",name="title") @io.swagger.annotations.ApiModelProperty(value="券名称",name="title")
private String title; private String title;


@@ -134,7 +134,7 @@ public class WxCouponOrderBVo extends WxCouponOrder {
private String bUserName; private String bUserName;
@io.swagger.annotations.ApiModelProperty(value="b端用户手机号",name="bUserPhone") @io.swagger.annotations.ApiModelProperty(value="b端用户手机号",name="bUserPhone")
private String bUserPhone; private String bUserPhone;
@Excel(name = "所属商户", width = 50, orderNum = "3")
@Excel(name = "所属商户", width = 50, orderNum = "3")
@io.swagger.annotations.ApiModelProperty(value="使用券商户名",name="merchantName") @io.swagger.annotations.ApiModelProperty(value="使用券商户名",name="merchantName")
private String merchantName; private String merchantName;
@@ -189,7 +189,7 @@ public class WxCouponOrderBVo extends WxCouponOrder {
@TableField(exist = false) @TableField(exist = false)
private Long couponId; private Long couponId;


@Excel(name = "类型", width = 50, orderNum = "15", replace = {"满减券_1", "代金券_2", "团购券_3", "礼品券_4", "停车券_5", "通用券_6", "砍价券_8", "团购券_9", "预购商品_10", "可配送商品_11", "券礼包_12", "积分券_50", "积分停车券_51", "消费卡_100"})
@Excel(name = "类型", width = 50, orderNum = "15", replace = {"满减券_1", "代金券_2", "团购券_3", "礼品券_4", "停车券_5", "通用券_6", "砍价券_8", "团购券_9", "预购商品_10", "可配送商品_11", "券礼包_12", "积分券_50", "积分停车券_51", "消费卡_100"})
@TableField(exist = false) @TableField(exist = false)
private Integer couponType; private Integer couponType;




+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Просмотреть файл

@@ -342,6 +342,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
@Override @Override
public void exportData(WxCouponOrderBVo wxCouponOrder, HttpServletRequest request, HttpServletResponse response) { public void exportData(WxCouponOrderBVo wxCouponOrder, HttpServletRequest request, HttpServletResponse response) {
String filename = "券订单"; String filename = "券订单";
if(EnumCouponType.COUPON_DISTRIBUTION.getCode().equals(wxCouponOrder.getCouponType())){
filename = "商品订单";
}
WxMerchant merchantQ = new WxMerchant(); WxMerchant merchantQ = new WxMerchant();
merchantQ.updateTenantInfo(wxCouponOrder); merchantQ.updateTenantInfo(wxCouponOrder);
List<WxMerchant> merchantList = wxMerchantMapper.findIdNameList(merchantQ); List<WxMerchant> merchantList = wxMerchantMapper.findIdNameList(merchantQ);


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