| @@ -53,7 +53,8 @@ public class WxCouponOrderController extends BaseController { | |||||
| if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrder(); | if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrder(); | ||||
| wxCouponOrder.setTenantId(getTenantId()); | wxCouponOrder.setTenantId(getTenantId()); | ||||
| wxCouponOrder.setSortColumns(WxCouponOrder.Field.Id_DESC); | wxCouponOrder.setSortColumns(WxCouponOrder.Field.Id_DESC); | ||||
| return wxCouponOrderService.listAdminAsPage(wxCouponOrder, pageNum, pageSize); | |||||
| ResultData rd = wxCouponOrderService.listAdminAsPage(wxCouponOrder, pageNum, pageSize); | |||||
| return rd; | |||||
| } | } | ||||
| @RequestMapping("/exportData") | @RequestMapping("/exportData") | ||||
| @@ -97,12 +97,17 @@ public class WxCouponOrderBVo extends WxCouponOrder{ | |||||
| @io.swagger.annotations.ApiModelProperty(value="面额",name="price") | @io.swagger.annotations.ApiModelProperty(value="面额",name="price") | ||||
| private Integer price; | private Integer price; | ||||
| /*b端用户姓名**/ | |||||
| /**商户名**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="商户名",name="merchantName") | |||||
| private String merchantName; | |||||
| /**b端用户姓名**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="b端用户姓名",name="bUserName") | @io.swagger.annotations.ApiModelProperty(value="b端用户姓名",name="bUserName") | ||||
| private String bUserName; | private String bUserName; | ||||
| /**b端用户手机号**/ | |||||
| @io.swagger.annotations.ApiModelProperty(value="b端用户手机号",name="bUserPhone") | |||||
| private String bUserPhone; | |||||
| /*c用户绑定的手机号**/ | |||||
| /**c用户绑定的手机号**/ | |||||
| @Excel(name="手机号",width = 20,orderNum = "1") | @Excel(name="手机号",width = 20,orderNum = "1") | ||||
| @io.swagger.annotations.ApiModelProperty(value="用户绑定的手机号",name="cUserPhone") | @io.swagger.annotations.ApiModelProperty(value="用户绑定的手机号",name="cUserPhone") | ||||
| private String cUserPhone; | private String cUserPhone; | ||||
| @@ -249,27 +254,18 @@ public class WxCouponOrderBVo extends WxCouponOrder{ | |||||
| } | } | ||||
| public static enum Field { | 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; | private String value; | ||||
| Field(String value) { | Field(String value) { | ||||
| @@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; | |||||
| import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; | import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; | ||||
| import cn.binarywang.wx.miniapp.api.WxMaService; | import cn.binarywang.wx.miniapp.api.WxMaService; | ||||
| import cn.binarywang.wx.miniapp.bean.WxMaTemplateMessage; | import cn.binarywang.wx.miniapp.bean.WxMaTemplateMessage; | ||||
| import com.github.pagehelper.Page; | |||||
| import com.github.pagehelper.PageHelper; | import com.github.pagehelper.PageHelper; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.google.common.collect.Lists; | import com.google.common.collect.Lists; | ||||
| @@ -247,8 +248,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| @Override | @Override | ||||
| public ResultData listAdminAsPage(WxCouponOrder wxCouponOrder, Integer pageIndex, Integer pageSize) { | public ResultData listAdminAsPage(WxCouponOrder wxCouponOrder, Integer pageIndex, Integer pageSize) { | ||||
| return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfAdmin(wxCouponOrder))); | |||||
| PageInfo<WxCouponOrderBVo> pageInfo= PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfAdmin(wxCouponOrder)); | |||||
| return new ResultData(pageInfo); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -124,10 +124,17 @@ | |||||
| <result column="use_price" jdbcType="INTEGER" property="usePrice" /> | <result column="use_price" jdbcType="INTEGER" property="usePrice" /> | ||||
| <result column="price" jdbcType="INTEGER" property="price" /> | <result column="price" jdbcType="INTEGER" property="price" /> | ||||
| <result column="merchant_name" jdbcType="VARCHAR" property="merchantName" /> | |||||
| <result column="name" jdbcType="VARCHAR" property="bUserName" /> | <result column="name" jdbcType="VARCHAR" property="bUserName" /> | ||||
| <result column="bphone" jdbcType="VARCHAR" property="bUserPhone" /> | |||||
| <result column="phone" jdbcType="VARCHAR" property="cUserPhone" /> | <result column="phone" jdbcType="VARCHAR" property="cUserPhone" /> | ||||
| </resultMap> | </resultMap> | ||||
| <sql id="allAdminCouponOrderColumns"> | |||||
| 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 | |||||
| </sql> | |||||
| <sql id="allBUserVerifiedCouponOrderColumns"> | <sql id="allBUserVerifiedCouponOrderColumns"> | ||||
| 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, | 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 @@ | |||||
| </select> | </select> | ||||
| <select id="findListOfAdmin" parameterType="com.iformall.domain.po.WxCouponOrder" resultMap="BVoResultMap"> | <select id="findListOfAdmin" parameterType="com.iformall.domain.po.WxCouponOrder" resultMap="BVoResultMap"> | ||||
| select <include refid="allBUserOrderedCouponOrderColumns" /> | |||||
| from wx_coupon_order co,wx_order o,wx_coupon c,wx_c_user cu | |||||
| select <include refid="allAdminCouponOrderColumns" /> | |||||
| from wx_coupon_order co,wx_order o,wx_coupon c,wx_c_user cu,wx_merchant_b_user bu, wx_merchant m | |||||
| where o.id = co.order_id | where o.id = co.order_id | ||||
| and co.coupon_id = c.id | and co.coupon_id = c.id | ||||
| and cu.id = co.c_user_id | and cu.id = co.c_user_id | ||||
| and bu.id = co.b_user_id | |||||
| and o.merchant_id = m.id | |||||
| <if test=" null != id "> | <if test=" null != id "> | ||||
| and co.id = #{id} | and co.id = #{id} | ||||
| </if> | </if> | ||||