diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java index f52f04a52..d270e2e0a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -6,6 +6,7 @@ import com.iformall.common.ResultData; import com.iformall.config.PayProperty; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxCouponOrder; +import com.iformall.domain.vo.WxCouponOrderBVo; import com.iformall.enums.EnumAppType; import com.iformall.enums.EnumRefundWay; import com.iformall.exception.MallinkException; @@ -24,6 +25,8 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.text.SimpleDateFormat; +import java.util.Date; import java.util.Map; @RestController @@ -49,18 +52,49 @@ public class WxCouponOrderController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { - if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrder(); + public ResultData list(@ModelAttribute WxCouponOrderBVo wxCouponOrder, Integer pageNum, Integer pageSize) { + if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderBVo(); wxCouponOrder.setTenantId(getTenantId()); wxCouponOrder.setSortColumns(WxCouponOrder.Field.Id_DESC); - ResultData rd = wxCouponOrderService.listAdminAsPage(wxCouponOrder, pageNum, pageSize); - return rd; + return wxCouponOrderService.listAdminAsPage(wxCouponOrder, pageNum, pageSize); } @RequestMapping("/exportData") - public void exportData(HttpServletRequest request, HttpServletResponse response) { + public void exportData( + @RequestParam("endDate") String endDate, + @RequestParam("startDate") String startDate, + @RequestParam("merchantName") String merchantName, + @RequestParam("couponOrderStatus") String couponOrderStatus, + @RequestParam("id") String id, + HttpServletRequest request, HttpServletResponse response) { - wxCouponOrderService.exportData(request, response, getTenantId()); + WxCouponOrderBVo wxCouponOrder = new WxCouponOrderBVo(); + wxCouponOrder.setTenantId(getTenantId()); + wxCouponOrder.setMerchantName(merchantName); + try { + wxCouponOrder.setId(Long.valueOf(id)); + }catch (Exception e){ + wxCouponOrder.setId(null); + } + try { + wxCouponOrder.setCouponOrderStatus(Integer.valueOf(couponOrderStatus)); + }catch (Exception e){ + wxCouponOrder.setCouponOrderStatus(null); + } + + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + try { + wxCouponOrder.setStartDate( sdf.parse(startDate)); + } catch (Exception e) { + wxCouponOrder.setStartDate(null); + } + try { + wxCouponOrder.setEndDate( sdf.parse(endDate)); + } catch (Exception e) { + wxCouponOrder.setEndDate(null); + } + + wxCouponOrderService.exportData(request, response, wxCouponOrder); } 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 a9734b8ac..44fc3f270 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java @@ -120,6 +120,31 @@ public class WxCouponOrderBVo extends WxCouponOrder{ @Excel(name="面额",width = 20,orderNum = "2") private String priceStr; + @Transient + private Date startDate; + + @Transient + private Date endDate; + + + public Date getStartDate() { + + return startDate; + } + + public void setStartDate(Date startDate) { + this.startDate = startDate; + } + + public Date getEndDate() { + return endDate; + } + + public void setEndDate(Date endDate) { + this.endDate = endDate; + } + + public String getTenantId() { return tenantId; } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java index 222299818..0a61aac5f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java @@ -25,7 +25,7 @@ public interface WxCouponOrderMapper extends CommonMapper { WxCouponOrderCVo selectDetailOfUser(Map paramMap); List findListOfCUser(WxCouponOrderCVo wxCouponOrder); - List findListOfAdmin(WxCouponOrder wxCouponOrder); + List findListOfAdmin(WxCouponOrderBVo wxCouponOrder); List findCarListOfCUser(WxCouponOrderCarCVo wxCouponOrder); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java index 1e442b68e..db4c3787f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java @@ -12,6 +12,7 @@ import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import com.iformall.domain.vo.WxCouponOrderBVo; import com.iformall.domain.vo.WxCouponOrderCVo; import com.iformall.domain.vo.WxCouponOrderCarCVo; @@ -132,9 +133,9 @@ public interface WxCouponOrderService { * @param pageSize * @return */ - ResultData listAdminAsPage(WxCouponOrder wxCouponOrder, Integer pageIndex, Integer pageSize); + ResultData listAdminAsPage(WxCouponOrderBVo wxCouponOrder, Integer pageIndex, Integer pageSize); - void exportData(HttpServletRequest request, HttpServletResponse response, String tenantId); + void exportData(HttpServletRequest request, HttpServletResponse response, WxCouponOrderBVo wxCouponOrder); /** 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 0af8b15b9..512158082 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -248,18 +248,17 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } @Override - public ResultData listAdminAsPage(WxCouponOrder wxCouponOrder, Integer pageIndex, Integer pageSize) { - PageInfo pageInfo= PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfAdmin(wxCouponOrder)); + public ResultData listAdminAsPage(WxCouponOrderBVo wxCouponOrderBVo, Integer pageIndex, Integer pageSize) { + PageInfo pageInfo= PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfAdmin(wxCouponOrderBVo)); return new ResultData(pageInfo); } @Override - public void exportData(HttpServletRequest request, HttpServletResponse response, String tenantId) { - WxCouponOrder wxCouponOrder = new WxCouponOrder(); - wxCouponOrder.setTenantId(tenantId); + public void exportData(HttpServletRequest request, HttpServletResponse response, WxCouponOrderBVo wxCouponOrder) { + List list = wxCouponOrderMapper.findListOfAdmin(wxCouponOrder); WxMall wxMall = new WxMall(); - wxMall.setTenantId(tenantId); + wxMall.setTenantId(wxCouponOrder.getTenantId()); wxMall = wxMallMapper.findList(wxMall).get(0); String filepath = Constant.fileDirectory; File savefile = new File(filepath); diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index ba8543723..2f9c9a8bb 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -185,14 +185,14 @@ order by co.update_date desc - select from wx_coupon_order co - left join wx_order o on o.id = co.order_id - left join wx_coupon c on co.coupon_id = c.id - left join wx_c_user cu on cu.id = co.c_user_id - left join wx_merchant_b_user bu on bu.id = co.b_user_id - left join wx_merchant m on o.merchant_id = m.id + inner JOIN wx_order o on o.id = co.order_id + inner JOIN wx_coupon c on co.coupon_id = c.id + inner JOIN wx_c_user cu on cu.id = co.c_user_id + inner JOIN wx_merchant m on o.merchant_id = m.id + left join wx_merchant_b_user bu on co.b_user_id = bu.id where 1 = 1 and co.id = #{id} @@ -202,57 +202,23 @@ and co.tenant_id = #{tenantId} - - and co.coupon_id = #{couponId} - - - - and co.c_user_id = #{cUserId} - - - - - and co.b_user_id = #{bUserId} - - - - - and co.order_id = #{orderId} - - - - - and co.expired_time = #{expiredTime} - - - and co.coupon_order_status = #{couponOrderStatus} - - - and co.create_date = #{createDate} - + + and m.name like concat('%', #{merchantName},'%') - - and co.update_date = #{updateDate} - + + AND co.create_date > #{startDate,jdbcType=TIMESTAMP} - - and co.coupon_price = #{couponPrice} - - - - and id in - - #{idItem} - + + AND co.create_date < #{endDate,jdbcType=TIMESTAMP} - order by ${sortColumns} + order by ${sortColumns}