| @@ -6,6 +6,7 @@ import com.iformall.common.ResultData; | |||||
| import com.iformall.config.PayProperty; | import com.iformall.config.PayProperty; | ||||
| import com.iformall.domain.po.WxAppinfo; | import com.iformall.domain.po.WxAppinfo; | ||||
| import com.iformall.domain.po.WxCouponOrder; | import com.iformall.domain.po.WxCouponOrder; | ||||
| import com.iformall.domain.vo.WxCouponOrderBVo; | |||||
| import com.iformall.enums.EnumAppType; | import com.iformall.enums.EnumAppType; | ||||
| import com.iformall.enums.EnumRefundWay; | import com.iformall.enums.EnumRefundWay; | ||||
| import com.iformall.exception.MallinkException; | import com.iformall.exception.MallinkException; | ||||
| @@ -24,6 +25,8 @@ import org.springframework.web.bind.annotation.*; | |||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| import javax.servlet.http.HttpServletResponse; | import javax.servlet.http.HttpServletResponse; | ||||
| import java.text.SimpleDateFormat; | |||||
| import java.util.Date; | |||||
| import java.util.Map; | import java.util.Map; | ||||
| @RestController | @RestController | ||||
| @@ -49,18 +52,49 @@ public class WxCouponOrderController extends BaseController { | |||||
| @ApiImplicitParams({ | @ApiImplicitParams({ | ||||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | ||||
| @ApiImplicitParam(name = "pageSize", 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.setTenantId(getTenantId()); | ||||
| wxCouponOrder.setSortColumns(WxCouponOrder.Field.Id_DESC); | wxCouponOrder.setSortColumns(WxCouponOrder.Field.Id_DESC); | ||||
| ResultData rd = wxCouponOrderService.listAdminAsPage(wxCouponOrder, pageNum, pageSize); | |||||
| return rd; | |||||
| return wxCouponOrderService.listAdminAsPage(wxCouponOrder, pageNum, pageSize); | |||||
| } | } | ||||
| @RequestMapping("/exportData") | @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); | |||||
| } | } | ||||
| @@ -120,6 +120,31 @@ public class WxCouponOrderBVo extends WxCouponOrder{ | |||||
| @Excel(name="面额",width = 20,orderNum = "2") | @Excel(name="面额",width = 20,orderNum = "2") | ||||
| private String priceStr; | 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() { | public String getTenantId() { | ||||
| return tenantId; | return tenantId; | ||||
| } | } | ||||
| @@ -25,7 +25,7 @@ public interface WxCouponOrderMapper extends CommonMapper<WxCouponOrder, Long> { | |||||
| WxCouponOrderCVo selectDetailOfUser(Map paramMap); | WxCouponOrderCVo selectDetailOfUser(Map paramMap); | ||||
| List<WxCouponOrderCVo> findListOfCUser(WxCouponOrderCVo wxCouponOrder); | List<WxCouponOrderCVo> findListOfCUser(WxCouponOrderCVo wxCouponOrder); | ||||
| List<WxCouponOrderBVo> findListOfAdmin(WxCouponOrder wxCouponOrder); | |||||
| List<WxCouponOrderBVo> findListOfAdmin(WxCouponOrderBVo wxCouponOrder); | |||||
| List<WxCouponOrderCarCVo> findCarListOfCUser(WxCouponOrderCarCVo wxCouponOrder); | List<WxCouponOrderCarCVo> findCarListOfCUser(WxCouponOrderCarCVo wxCouponOrder); | ||||
| @@ -12,6 +12,7 @@ import java.util.List; | |||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| import javax.servlet.http.HttpServletResponse; | import javax.servlet.http.HttpServletResponse; | ||||
| import com.iformall.domain.vo.WxCouponOrderBVo; | |||||
| import com.iformall.domain.vo.WxCouponOrderCVo; | import com.iformall.domain.vo.WxCouponOrderCVo; | ||||
| import com.iformall.domain.vo.WxCouponOrderCarCVo; | import com.iformall.domain.vo.WxCouponOrderCarCVo; | ||||
| @@ -132,9 +133,9 @@ public interface WxCouponOrderService { | |||||
| * @param pageSize | * @param pageSize | ||||
| * @return | * @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); | |||||
| /** | /** | ||||
| @@ -248,18 +248,17 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public ResultData listAdminAsPage(WxCouponOrder wxCouponOrder, Integer pageIndex, Integer pageSize) { | |||||
| PageInfo<WxCouponOrderBVo> pageInfo= PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfAdmin(wxCouponOrder)); | |||||
| public ResultData listAdminAsPage(WxCouponOrderBVo wxCouponOrderBVo, Integer pageIndex, Integer pageSize) { | |||||
| PageInfo<WxCouponOrderBVo> pageInfo= PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfAdmin(wxCouponOrderBVo)); | |||||
| return new ResultData(pageInfo); | return new ResultData(pageInfo); | ||||
| } | } | ||||
| @Override | @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<WxCouponOrderBVo> list = wxCouponOrderMapper.findListOfAdmin(wxCouponOrder); | List<WxCouponOrderBVo> list = wxCouponOrderMapper.findListOfAdmin(wxCouponOrder); | ||||
| WxMall wxMall = new WxMall(); | WxMall wxMall = new WxMall(); | ||||
| wxMall.setTenantId(tenantId); | |||||
| wxMall.setTenantId(wxCouponOrder.getTenantId()); | |||||
| wxMall = wxMallMapper.findList(wxMall).get(0); | wxMall = wxMallMapper.findList(wxMall).get(0); | ||||
| String filepath = Constant.fileDirectory; | String filepath = Constant.fileDirectory; | ||||
| File savefile = new File(filepath); | File savefile = new File(filepath); | ||||
| @@ -185,14 +185,14 @@ | |||||
| order by co.update_date desc | order by co.update_date desc | ||||
| </select> | </select> | ||||
| <select id="findListOfAdmin" parameterType="com.iformall.domain.po.WxCouponOrder" resultMap="BVoResultMap"> | |||||
| <select id="findListOfAdmin" parameterType="com.iformall.domain.vo.WxCouponOrderBVo" resultMap="BVoResultMap"> | |||||
| select <include refid="allAdminCouponOrderColumns" /> | select <include refid="allAdminCouponOrderColumns" /> | ||||
| from wx_coupon_order co | 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 | where 1 = 1 | ||||
| <if test=" null != id "> | <if test=" null != id "> | ||||
| and co.id = #{id} | and co.id = #{id} | ||||
| @@ -202,57 +202,23 @@ | |||||
| and co.tenant_id = #{tenantId} | and co.tenant_id = #{tenantId} | ||||
| </if> | </if> | ||||
| <if test=" null != couponId "> | |||||
| and co.coupon_id = #{couponId} | |||||
| </if> | |||||
| <if test=" null != cUserId "> | |||||
| and co.c_user_id = #{cUserId} | |||||
| </if> | |||||
| <if test=" null != bUserId "> | |||||
| and co.b_user_id = #{bUserId} | |||||
| </if> | |||||
| <if test=" null != orderId "> | |||||
| and co.order_id = #{orderId} | |||||
| </if> | |||||
| <if test=" null != expiredTime "> | |||||
| and co.expired_time = #{expiredTime} | |||||
| </if> | |||||
| <if test=" null != couponOrderStatus "> | <if test=" null != couponOrderStatus "> | ||||
| and co.coupon_order_status = #{couponOrderStatus} | and co.coupon_order_status = #{couponOrderStatus} | ||||
| </if> | </if> | ||||
| <if test=" null != createDate "> | |||||
| and co.create_date = #{createDate} | |||||
| <if test=" null != merchantName "> | |||||
| and m.name like concat('%', #{merchantName},'%') | |||||
| </if> | </if> | ||||
| <if test=" null != updateDate "> | |||||
| and co.update_date = #{updateDate} | |||||
| <if test="startDate != null"> | |||||
| AND co.create_date > #{startDate,jdbcType=TIMESTAMP} | |||||
| </if> | </if> | ||||
| <if test=" null != couponPrice "> | |||||
| and co.coupon_price = #{couponPrice} | |||||
| </if> | |||||
| <if test=" null != ids "> | |||||
| and id in | |||||
| <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | |||||
| #{idItem} | |||||
| </foreach> | |||||
| <if test="endDate != null"> | |||||
| AND co.create_date < #{endDate,jdbcType=TIMESTAMP} | |||||
| </if> | </if> | ||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||||
| </select> | </select> | ||||