| @@ -38,18 +38,9 @@ public class WxCouponChannelController extends BaseController | |||||
| if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel(); | if (null == wxCouponChannel) wxCouponChannel = new WxCouponChannel(); | ||||
| wxCouponChannel.setTenantId(getTenantId()); | wxCouponChannel.setTenantId(getTenantId()); | ||||
| wxCouponChannel.setStatus(0); | wxCouponChannel.setStatus(0); | ||||
| wxCouponChannel.setSortColumns(WxCouponChannel.Field.EndTime_ASC); | |||||
| final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCAPI(wxCouponChannel, pageNum, pageSize); | final PageInfo<WxCouponChannelVo> page = wxCouponChannelService.listPageCAPI(wxCouponChannel, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @ApiOperation("根据id查询接口") | |||||
| @GetMapping("/findById") | |||||
| @ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true) | |||||
| public ResultData findById(Long id) { | |||||
| return new ResultData(Result.SUCCESS,"查询成功",wxCouponChannelService.getById(id)); | |||||
| } | |||||
| } | } | ||||
| @@ -62,14 +62,21 @@ 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), | ||||
| @ApiImplicitParam(name = "couponOrderStatus", value="券状态状态:0,待使用 1,已核销 2,已过期 3,已作废", dataType="int", paramType = "query",required=false) | |||||
| }) | }) | ||||
| public ResultData list(Integer couponOrderStatus, Integer pageNum, Integer pageSize) { | |||||
| public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { | |||||
| if(pageNum == null || pageSize == null) { | if(pageNum == null || pageSize == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| } | } | ||||
| return wxCouponOrderService.listCUserVoAsPage(getUser().getId(), couponOrderStatus, pageNum, pageSize); | |||||
| if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrder(); | |||||
| wxCouponOrder.setCUserId(getUser().getId()); | |||||
| if (wxCouponOrder.getCouponOrderStatus() == null) | |||||
| wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); | |||||
| else if (wxCouponOrder.getCouponOrderStatus() == 0) | |||||
| wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); | |||||
| else | |||||
| wxCouponOrder.setSortColumns(WxCouponOrder.Field.UpdateDate_DESC); | |||||
| return wxCouponOrderService.listCUserVoAsPage(wxCouponOrder, pageNum, pageSize); | |||||
| } | } | ||||
| @ApiOperation(value = "卡券详情接口") | @ApiOperation(value = "卡券详情接口") | ||||
| @@ -204,6 +204,7 @@ public class WxOrderController extends BaseController { | |||||
| // c端用户应该只能看到自己的订单 | // c端用户应该只能看到自己的订单 | ||||
| if (wxOrder == null) wxOrder = new WxOrder(); | if (wxOrder == null) wxOrder = new WxOrder(); | ||||
| wxOrder.setCUserId(getUser().getId()); | wxOrder.setCUserId(getUser().getId()); | ||||
| wxOrder.setSortColumns(WxOrder.Field.CreateDate_DESC); | |||||
| final PageInfo<WxOrderCVo> page = wxOrderService.listCUserVoAsPage(wxOrder, pageNum, pageSize); | final PageInfo<WxOrderCVo> page = wxOrderService.listCUserVoAsPage(wxOrder, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -18,8 +18,8 @@ public interface WxCouponOrderMapper extends CommonMapper<WxCouponOrder, Long> { | |||||
| List<WxCouponOrderBVo> findListOfUnverifiedByDateForBUser(Map dateMap); | List<WxCouponOrderBVo> findListOfUnverifiedByDateForBUser(Map dateMap); | ||||
| List<WxCouponOrderBVo> findListOfVerifiedByDateForBUser(Map dateMap); | List<WxCouponOrderBVo> findListOfVerifiedByDateForBUser(Map dateMap); | ||||
| List<WxCouponOrderCVo> findListOfCUser(Map paramMap); | |||||
| WxCouponOrderCVo selectDetailOfCUser(Map paramMap); | |||||
| WxCouponOrderCVo selectDetailOfUser(Map paramMap); | |||||
| List<WxCouponOrderCVo> findListOfCUser(WxCouponOrder wxCouponOrder); | |||||
| List<WxCouponOrderCVo> findListOfAdmin(WxCouponOrder wxCouponOrder); | List<WxCouponOrderCVo> findListOfAdmin(WxCouponOrder wxCouponOrder); | ||||
| } | } | ||||
| @@ -80,7 +80,7 @@ public interface WxCouponOrderService { | |||||
| * @param bUserId C端用户 | * @param bUserId C端用户 | ||||
| */ | */ | ||||
| ResultData listCUserVoAsPage(Long cUserId, Integer pageIndex, Integer pageSize, Integer status); | |||||
| ResultData listCUserVoAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize); | |||||
| /** | /** | ||||
| * C用户查券详情 | * C用户查券详情 | ||||
| @@ -152,21 +152,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public ResultData listCUserVoAsPage(Long cUserId, Integer status, Integer pageIndex, Integer pageSize) { | |||||
| public ResultData listCUserVoAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize) { | |||||
| WxCUser wxCuser = wxCUserMapper.selectByPrimaryKey(cUserId); | |||||
| if(wxCuser == null){ | |||||
| logger.error("用户不存在:"+ cUserId); | |||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY); | |||||
| } | |||||
| Map paramMap = new HashMap(); | |||||
| paramMap.put("cUserId", cUserId); | |||||
| paramMap.put("tenantId", wxCuser.getTenantId()); | |||||
| if (status != null) | |||||
| paramMap.put("status", status); | |||||
| return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfCUser(paramMap))); | |||||
| return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfCUser(record))); | |||||
| } | } | ||||
| @Override | @Override | ||||
| @@ -182,7 +170,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| paramMap.put("tenantId", wxCuser.getTenantId()); | paramMap.put("tenantId", wxCuser.getTenantId()); | ||||
| paramMap.put("couponOrderId", couponOrderId); | paramMap.put("couponOrderId", couponOrderId); | ||||
| WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderMapper.selectDetailOfCUser(paramMap); | |||||
| WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderMapper.selectDetailOfUser(paramMap); | |||||
| if (wxCouponOrderCVo == null) | if (wxCouponOrderCVo == null) | ||||
| return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); | return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); | ||||
| return new ResultData(wxCouponOrderCVo); | return new ResultData(wxCouponOrderCVo); | ||||
| @@ -206,7 +194,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| paramMap.put("merchantId", wxMerchant.getId()); | paramMap.put("merchantId", wxMerchant.getId()); | ||||
| paramMap.put("tenantId", wxMerchant.getTenantId()); | paramMap.put("tenantId", wxMerchant.getTenantId()); | ||||
| paramMap.put("couponOrderId", couponOrderId); | paramMap.put("couponOrderId", couponOrderId); | ||||
| WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderMapper.selectDetailOfCUser(paramMap); | |||||
| WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderMapper.selectDetailOfUser(paramMap); | |||||
| if (wxCouponOrderCVo == null) | if (wxCouponOrderCVo == null) | ||||
| return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); | return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); | ||||
| return new ResultData(wxCouponOrderCVo); | return new ResultData(wxCouponOrderCVo); | ||||
| @@ -329,28 +329,25 @@ | |||||
| </resultMap> | </resultMap> | ||||
| <select id="findListOfCUser" parameterType="map" resultMap="CVoResultMap"> | |||||
| <select id="findListOfCUser" parameterType="com.simple.domain.po.WxCouponOrder" resultMap="CVoResultMap"> | |||||
| select <include refid="allCUserCouponOrderListColumns" /> | select <include refid="allCUserCouponOrderListColumns" /> | ||||
| from wx_coupon_order c,wx_coupon co,wx_merchant m | from wx_coupon_order c,wx_coupon co,wx_merchant m | ||||
| where 1=1 | where 1=1 | ||||
| and c.coupon_id = co.id | |||||
| and co.merchant_id = m.id | |||||
| <if test="cUserId != null"> | <if test="cUserId != null"> | ||||
| and c.c_user_id = #{cUserId} | and c.c_user_id = #{cUserId} | ||||
| </if> | </if> | ||||
| <if test="merchantId != null"> | |||||
| and co.merchant_id = #{merchantId} | |||||
| </if> | |||||
| <if test="tenantId != null"> | <if test="tenantId != null"> | ||||
| and c.tenant_id = #{tenantId} | and c.tenant_id = #{tenantId} | ||||
| </if> | </if> | ||||
| and c.coupon_id = co.id | |||||
| and co.merchant_id = m.id | |||||
| <if test="status != null"> | |||||
| AND c.coupon_order_status = #{status} | |||||
| <if test="couponOrderStatus != null"> | |||||
| AND c.coupon_order_status = #{couponOrderStatus} | |||||
| </if> | </if> | ||||
| order by c.create_date desc | |||||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||||
| </select> | </select> | ||||
| <select id="selectDetailOfCUser" parameterType="map" resultMap="CVoResultMap"> | |||||
| <select id="selectDetailOfUser" parameterType="map" resultMap="CVoResultMap"> | |||||
| select <include refid="allCUserCouponOrderDetailColumns" /> | select <include refid="allCUserCouponOrderDetailColumns" /> | ||||
| from wx_coupon_order c,wx_coupon co,wx_merchant m | from wx_coupon_order c,wx_coupon co,wx_merchant m | ||||
| left join wx_merchant_shop ms on ms.merchant_id = m.id | left join wx_merchant_shop ms on ms.merchant_id = m.id | ||||
| @@ -120,6 +120,8 @@ | |||||
| where order_status = '0' | where order_status = '0' | ||||
| <if test="startDate != null"> | <if test="startDate != null"> | ||||
| AND create_date > #{startDate,jdbcType=TIMESTAMP} | AND create_date > #{startDate,jdbcType=TIMESTAMP} | ||||
| </if> | |||||
| <if test="endDate != null"> | |||||
| AND create_date < #{endDate,jdbcType=TIMESTAMP} | AND create_date < #{endDate,jdbcType=TIMESTAMP} | ||||
| </if> | </if> | ||||
| </select> | </select> | ||||