diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java index 232d643a4..a26dfe9f7 100644 --- a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderBVo.java @@ -1,5 +1,6 @@ package com.simple.domain.vo; +import cn.afterturn.easypoi.excel.annotation.Excel; import com.simple.domain.po.WxCouponOrder; import javax.persistence.Id; @@ -56,15 +57,19 @@ public class WxCouponOrderBVo extends WxCouponOrder{ @io.swagger.annotations.ApiModelProperty(value = "操作券B端小程序用户ID", name = "bUserId") private Long bUserId; /*用户订单ID**/ + @Excel(name="订单号",width = 20) @io.swagger.annotations.ApiModelProperty(value = "用户订单ID", name = "orderId") private Long orderId; /*该订单对应券的实际过期时间**/ @io.swagger.annotations.ApiModelProperty(value = "该订单对应券的实际过期时间 ", name = "expiredTime") private Date expiredTime; /*状态:0,待使用 1,已核销 2,已过期 3,已作废 **/ + + @Excel(name="订单状态",width = 20,replace = { "可以退款_0", "已经使用_1","已经过期_2","已经退款_3"},orderNum = "4") @io.swagger.annotations.ApiModelProperty(value = "状态:0,待使用 1,已核销 2,已过期 3,已作废 ", name = "couponOrderStatus") private Integer couponOrderStatus; /***/ + @Excel(name="交易时间",width = 20,exportFormat="yyyy-MM-dd",orderNum = "3") @io.swagger.annotations.ApiModelProperty(value = "", name = "createDate") private Date createDate; /***/ @@ -82,6 +87,7 @@ public class WxCouponOrderBVo extends WxCouponOrder{ @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") private String title; /*售价(适用于类型2,3,4,5)**/ + @Excel(name="交易价格",width = 20,orderNum = "2") @io.swagger.annotations.ApiModelProperty(value="售价(适用于类型2,3,4,5)",name="salePrice") private Integer salePrice; /*使用条件金额(适用于类型1,2,3,4)**/ @@ -97,6 +103,7 @@ public class WxCouponOrderBVo extends WxCouponOrder{ private String bUserName; /*c用户绑定的手机号**/ + @Excel(name="手机号",width = 20,orderNum = "1") @io.swagger.annotations.ApiModelProperty(value="用户绑定的手机号",name="cUserPhone") private String cUserPhone; @@ -193,18 +200,20 @@ public class WxCouponOrderBVo extends WxCouponOrder{ price = _price; } - public String getCUserPhone() { - return cUserPhone; + public String getbUserName() { + return bUserName; } - public void setCUserPhone(String _phone) { - cUserPhone = _phone; + + public void setbUserName(String bUserName) { + this.bUserName = bUserName; } - public String getBUserName() { - return bUserName; + public String getcUserPhone() { + return cUserPhone; } - public void setBUserName(String _name) { - this.bUserName = _name; + + public void setcUserPhone(String cUserPhone) { + this.cUserPhone = cUserPhone; } public static enum Field { diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java index d6a5b7cde..710789c09 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java @@ -1,10 +1,14 @@ package com.simple.mapper; -import java.util.*; import com.simple.common.CommonMapper; +import com.simple.domain.po.WxCouponOrder; import com.simple.domain.vo.*; import org.apache.ibatis.annotations.Param; -import com.simple.domain.po.WxCouponOrder; + +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; public interface WxCouponOrderMapper extends CommonMapper { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java index f17de51c1..2b5efc0ba 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java @@ -2,13 +2,13 @@ package com.simple.service.impl; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; -import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.simple.common.ErrorCode; import com.simple.common.IdWorker; import com.simple.common.ResultData; import com.simple.domain.po.*; +import com.simple.domain.vo.WxCouponOrderBVo; import com.simple.domain.vo.WxCouponOrderCVo; import com.simple.enums.EnumCouponOrderStatus; import com.simple.exception.MallinkException; @@ -16,7 +16,6 @@ import com.simple.mapper.*; import com.simple.service.WxCouponOrderService; import org.apache.log4j.Logger; import org.apache.poi.ss.usermodel.Workbook; -import org.aspectj.apache.bcel.classfile.ConstantString; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; @@ -215,7 +214,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { public void exportData(HttpServletRequest request, HttpServletResponse response, String tenantId) { WxCouponOrder wxCouponOrder = new WxCouponOrder(); wxCouponOrder.setTenantId(tenantId); - List list = wxCouponOrderMapper.findList(wxCouponOrder); + List list = wxCouponOrderMapper.findListOfAdmin(wxCouponOrder); String filepath="./uploads/"; File savefile = new File(filepath); @@ -223,7 +222,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { savefile.mkdirs(); } - Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), WxCouponOrder.class, list); + Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), WxCouponOrderBVo.class, list); FileOutputStream fos = null; try { String filename=UUID.randomUUID()+".xlsx";