diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java index 4b2790f80..2643004e1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -55,13 +55,26 @@ public class WxCouponOrderController extends BaseController { logger.debug("[" + getIpAddr() + "] WxCouponOrderController::list"); if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderBVo(); wxCouponOrder.setTenantId(getTenantId()); - if (wxCouponOrder.getMerchantName().isEmpty()) { + if (wxCouponOrder.getMerchantName() != null && + wxCouponOrder.getMerchantName().isEmpty()) { wxCouponOrder.setMerchantName(null); } wxCouponOrder.setSortColumns(WxCouponOrder.Field.Id_DESC); return wxCouponOrderService.listAdminAsPage(wxCouponOrder, pageNum, pageSize); } + @ApiOperation(value = "卡券详情接口") + @GetMapping("detail") + @ApiImplicitParams({ + @ApiImplicitParam(name = "couponOrderId", value = "券ID", dataType = "Long", paramType = "query", required = true) + }) + public ResultData detail(@RequestParam("couponOrderId") Long couponOrderId) { + if(couponOrderId == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + return wxCouponOrderService.detailAdminVo(couponOrderId); + } + @RequestMapping("/exportData") public void exportData( @RequestParam("endDate") String endDate, diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java index b20af33fa..6c1aa7824 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java @@ -26,11 +26,10 @@ public interface WxCouponOrderMapper extends CommonMapper { List findListOfOrderedByDateForBUser(Map dateMap); List findListOfVerifiedByDateForBUser(Map dateMap); - WxCouponOrderCVo findDetail(@Param("id")Long id); - List findListOfCUser(WxCouponOrder wxCouponOrder); + WxCouponOrderCVo findDetailOfCUser(@Param("id")Long id); List findListOfAdmin(WxCouponOrderBVo wxCouponOrder); - + WxCouponOrderBVo findDetailOfAdmin(@Param("id")Long id); /** * 查询用户核销/领券数 * @param cUserId diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java index 667b0116e..8012bdf28 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java @@ -138,6 +138,9 @@ public interface WxCouponOrderService { */ ResultData listAdminAsPage(WxCouponOrderBVo wxCouponOrder, Integer pageIndex, Integer pageSize); + + ResultData detailAdminVo(Long couponOrderId); + 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 6ee4dd4f6..3ea16b3c5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -192,7 +192,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { throw new MallinkException(ErrorCode.USER_IS_EMPTY); } - WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderMapper.findDetail(Long.valueOf(couponOrderId)); + WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderMapper.findDetailOfCUser(Long.valueOf(couponOrderId)); if (wxCouponOrderCVo == null) return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); return new ResultData(wxCouponOrderCVo); @@ -223,7 +223,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); } - WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderMapper.findDetail(Long.valueOf(couponOrderId)); + WxCouponOrderCVo wxCouponOrderCVo = wxCouponOrderMapper.findDetailOfCUser(Long.valueOf(couponOrderId)); if (wxCouponOrderCVo == null) return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); return new ResultData(wxCouponOrderCVo); @@ -235,6 +235,15 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { return new ResultData(pageInfo); } + @Override + public ResultData detailAdminVo(Long couponOrderId) { + + WxCouponOrderBVo wxCouponOrderBVo = wxCouponOrderMapper.findDetailOfAdmin(couponOrderId); + if (wxCouponOrderBVo == null) + return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); + return new ResultData(wxCouponOrderBVo); + } + @Override public void exportData(HttpServletRequest request, HttpServletResponse response, WxCouponOrderBVo wxCouponOrder) { diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 045106b8d..58f93d094 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -320,21 +320,36 @@ - + + co.id,co.tenant_id,co.coupon_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, + c.title,c.sale_price,c.use_price,c.price,c.unit, + m.name as merchant_name + + + 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,c.unit, - bu.name, bu.phone as bphone, cu.phone, m.name as merchant_name + bu.name, bu.phone as bphone, + cu.phone, + m.name as merchant_name + + 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,c.unit, @@ -376,14 +413,13 @@ select - from wx_coupon_order co,wx_order o,wx_coupon c,wx_c_user cu,wx_merchant_b_user bu - where o.id = co.order_id - and co.coupon_id = c.id + from wx_coupon_order co,wx_coupon c,wx_c_user cu,wx_merchant_b_user bu + where co.coupon_id = c.id and cu.id = co.c_user_id and bu.id = co.b_user_id and bu.merchant_id = #{merchantId} @@ -518,7 +553,7 @@ - select from wx_coupon_order co,wx_coupon c where co.coupon_id = c.id