diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java index 5a407b388..f52f04a52 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -53,7 +53,8 @@ public class WxCouponOrderController extends BaseController { if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrder(); wxCouponOrder.setTenantId(getTenantId()); wxCouponOrder.setSortColumns(WxCouponOrder.Field.Id_DESC); - return wxCouponOrderService.listAdminAsPage(wxCouponOrder, pageNum, pageSize); + ResultData rd = wxCouponOrderService.listAdminAsPage(wxCouponOrder, pageNum, pageSize); + return rd; } @RequestMapping("/exportData") diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java index 8ccbef1eb..b975a8df1 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -97,12 +97,17 @@ public class WxCouponOrderBVo extends WxCouponOrder{ @io.swagger.annotations.ApiModelProperty(value="面额",name="price") private Integer price; - - /*b端用户姓名**/ + /**商户名**/ + @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") + private String merchantName; + /**b端用户姓名**/ @io.swagger.annotations.ApiModelProperty(value="b端用户姓名",name="bUserName") private String bUserName; + /**b端用户手机号**/ + @io.swagger.annotations.ApiModelProperty(value="b端用户手机号",name="bUserPhone") + private String bUserPhone; - /*c用户绑定的手机号**/ + /**c用户绑定的手机号**/ @Excel(name="手机号",width = 20,orderNum = "1") @io.swagger.annotations.ApiModelProperty(value="用户绑定的手机号",name="cUserPhone") private String cUserPhone; @@ -249,27 +254,18 @@ public class WxCouponOrderBVo extends WxCouponOrder{ } public static enum Field { - Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), - TenantId_ASC("`tenant_id` ASC"), - TenantId_DESC("`tenant_id` DESC"), - CouponId_ASC("`coupon_id` ASC"), - CouponId_DESC("`coupon_id` DESC"), - CUserId_ASC("`c_user_id` ASC"), - CUserId_DESC("`c_user_id` DESC"), - BUserId_ASC("`b_user_id` ASC"), - BUserId_DESC("`b_user_id` DESC"), - OrderId_ASC("`order_id` ASC"), - OrderId_DESC("`order_id` DESC"), - ExpiredTime_ASC("`expired_time` ASC"), - ExpiredTime_DESC("`expired_time` DESC"), - CouponOrderStatus_ASC("`coupon_order_status` ASC"), - CouponOrderStatus_DESC("`coupon_order_status` DESC"), - CreateDate_ASC("`create_date` ASC"), - CreateDate_DESC("`create_date` DESC"), - UpdateDate_ASC("`update_date` ASC"), - UpdateDate_DESC("`update_date` DESC"), - CouponPrice_ASC("`coupon_price` ASC"), - CouponPrice_DESC("`coupon_price` DESC"); + Id_ASC("`id` ASC"), Id_DESC("`id` DESC") + ,TenantId_ASC("`tenant_id` ASC"),TenantId_DESC("`tenant_id` DESC") + ,CouponId_ASC("`coupon_id` ASC"),CouponId_DESC("`coupon_id` DESC") + ,CUserId_ASC("`c_user_id` ASC"), CUserId_DESC("`c_user_id` DESC") + ,BUserId_ASC("`b_user_id` ASC"), BUserId_DESC("`b_user_id` DESC") + ,OrderId_ASC("`order_id` ASC"), OrderId_DESC("`order_id` DESC") + ,ExpiredTime_ASC("`expired_time` ASC"), ExpiredTime_DESC("`expired_time` DESC") + ,CouponOrderStatus_ASC("`coupon_order_status` ASC"), CouponOrderStatus_DESC("`coupon_order_status` DESC") + ,CreateDate_ASC("`create_date` ASC"), CreateDate_DESC("`create_date` DESC") + ,UpdateDate_ASC("`update_date` ASC"), UpdateDate_DESC("`update_date` DESC") + ,CouponPrice_ASC("`coupon_price` ASC"), CouponPrice_DESC("`coupon_price` DESC") + ; private String value; Field(String value) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 5a70ffcbc..6ecbdf9f4 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import cn.binarywang.wx.miniapp.api.WxMaService; import cn.binarywang.wx.miniapp.bean.WxMaTemplateMessage; +import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.google.common.collect.Lists; @@ -247,8 +248,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override public ResultData listAdminAsPage(WxCouponOrder wxCouponOrder, Integer pageIndex, Integer pageSize) { - - return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfAdmin(wxCouponOrder))); + PageInfo pageInfo= PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfAdmin(wxCouponOrder)); + return new ResultData(pageInfo); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index ea29f6b5c..e2efd1108 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -124,10 +124,17 @@ + + + + co.id,co.tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, + c.type,c.title,c.sale_price,c.use_price,c.price, + m.name as merchant_name, bu.name, bu.phone as bphone, cu.phone + co.id,co.tenant_id,co.coupon_id,co.c_user_id,co.b_user_id,co.order_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, @@ -181,11 +188,13 @@