From 4dcbcbb1089d58d54d1aa4627109c0965fa339de Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 12 Dec 2018 14:46:04 +0800 Subject: [PATCH] =?UTF-8?q?[A=E7=AB=AF][=E9=9C=80=E6=B1=82]:=E8=B0=83?= =?UTF-8?q?=E6=95=B4BC=E4=B8=A4=E7=AB=AF=E7=9A=84=E5=8D=A1=E5=88=B8?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=94=AF=E6=8C=81=E5=A4=9A=E5=95=86=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxCarController.java | 9 ++--- .../controller/WxCouponOrderController.java | 2 +- .../iformall/mapper/WxCouponOrderMapper.java | 4 +- .../service/WxCouponOrderService.java | 20 +++++----- .../impl/WxCouponOrderServiceImpl.java | 14 +++---- .../resources/mapper/WxCouponOrderMapper.xml | 39 ++++++++----------- 6 files changed, 41 insertions(+), 47 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index 8d1ff6e3b..57c88ede9 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -648,13 +648,12 @@ public class WxCarController extends BaseController { } WxCouponOrderCarCVo userCar = null; - WxCouponOrderCarCVo userCarQ = new WxCouponOrderCarCVo(); + WxCouponOrder userCarQ = new WxCouponOrder(); userCarQ.setTenantId(user.getTenantId()); userCarQ.setCUserId(user.getId()); - userCarQ.setType(EnumCouponType.COUPON_TINGCHE.getCode()); userCarQ.setId(couponOrderId); userCarQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); - List list = wxCouponOrderService.carlistCUserVo(userCarQ); + List list = wxCouponOrderService.carListCUserVo(userCarQ); if (list.size() > 0) { userCar = list.get(0); } @@ -704,7 +703,7 @@ public class WxCarController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), }) - public ResultData list(@ModelAttribute WxCouponOrderCarCVo wxCouponOrder, Integer pageNum, Integer pageSize) { + public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { if(pageNum == null || pageSize == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); @@ -719,7 +718,7 @@ public class WxCarController extends BaseController { wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); else wxCouponOrder.setSortColumns(WxCouponOrder.Field.UpdateDate_DESC); - return wxCouponOrderService.carlistCUserVoAsPage(wxCouponOrder, pageNum, pageSize); + return wxCouponOrderService.carListCUserVoAsPage(wxCouponOrder, pageNum, pageSize); } @ApiOperation(value = "停车场状态") diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index fbcfb163d..fed1403c3 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -36,7 +36,7 @@ public class WxCouponOrderController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), }) - public ResultData list(@ModelAttribute WxCouponOrderCVo wxCouponOrder, Integer pageNum, Integer pageSize) { + public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { if (pageNum == null || pageSize == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java index 02c44da35..b20af33fa 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java @@ -17,7 +17,7 @@ public interface WxCouponOrderMapper extends CommonMapper { Integer dayCountCarList(Map params); - List findCarListOfCUser(WxCouponOrderCarCVo wxCouponOrder); + List findCarListOfCUser(WxCouponOrder wxCouponOrder); List findListOfOrderedByDate(Map dateMap); @@ -28,7 +28,7 @@ public interface WxCouponOrderMapper extends CommonMapper { WxCouponOrderCVo findDetail(@Param("id")Long id); - List findListOfCUser(WxCouponOrderCVo wxCouponOrder); + List findListOfCUser(WxCouponOrder wxCouponOrder); List findListOfAdmin(WxCouponOrderBVo wxCouponOrder); /** diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java index 9eca58a29..667b0116e 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java @@ -101,7 +101,14 @@ public interface WxCouponOrderService { * @param record C端用户 */ - ResultData listCUserVoAsPage(WxCouponOrderCVo record, Integer pageIndex, Integer pageSize); + ResultData listCUserVoAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize); + + /** + * C用户查券详情 + * + * @param cUserId C端用户 + */ + ResultData detailCUserVo(Long cUserId, String couponOrderId); /** * C用户查券carlist @@ -109,16 +116,10 @@ public interface WxCouponOrderService { * @param record C端用户 */ - ResultData carlistCUserVoAsPage(WxCouponOrderCarCVo record, Integer pageIndex, Integer pageSize); + ResultData carListCUserVoAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize); - List carlistCUserVo(WxCouponOrderCarCVo record); + List carListCUserVo(WxCouponOrder record); - /** - * C用户查券详情 - * - * @param cUserId C端用户 - */ - ResultData detailCUserVo(Long cUserId, String couponOrderId); /** * B用户查券详情 @@ -127,7 +128,6 @@ public interface WxCouponOrderService { */ ResultData detailBUserVo(Long bUserId, String couponOrderId); - /** * A端查询分页列表 * 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 5ec891a85..6ee4dd4f6 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -128,7 +128,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { logger.error("商户不存在:" + bUserId); throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); } -/* + SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); String dateString; Date startDate; @@ -153,10 +153,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { cal.add(Calendar.DATE, 1); endDate = cal.getTime(); } -*/ + Map dateMap = new HashMap(); - // dateMap.put("startDate", startDate); - // dateMap.put("endDate", endDate); + dateMap.put("startDate", startDate); + dateMap.put("endDate", endDate); dateMap.put("merchantId", wxMerchant.getId()); Map resultMap = new HashMap(); @@ -179,7 +179,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } @Override - public ResultData listCUserVoAsPage(WxCouponOrderCVo record, Integer pageIndex, Integer pageSize) { + public ResultData listCUserVoAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize) { return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfCUser(record))); } @@ -200,12 +200,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override - public ResultData carlistCUserVoAsPage(WxCouponOrderCarCVo record, Integer pageIndex, Integer pageSize) { + public ResultData carListCUserVoAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize) { return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findCarListOfCUser(record))); } @Override - public List carlistCUserVo(WxCouponOrderCarCVo record) { + public List carListCUserVo(WxCouponOrder record) { return wxCouponOrderMapper.findCarListOfCUser(record); } diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index b6f3f575d..045106b8d 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -423,9 +423,16 @@ select - from wx_coupon_order co,wx_order o - where o.id = co.order_id - and o.merchant_id = #{merchantId} + from wx_coupon_order co, wx_merchant_b_user mbu + where mbu.id = co.b_user_id + and mbu.merchant_id = #{merchantId} AND co.update_date > #{startDate,jdbcType=TIMESTAMP} @@ -497,18 +504,13 @@ from wx_coupon_order co,wx_coupon c where 1=1 and co.coupon_id = c.id + and c.type < 5 and co.c_user_id = #{cUserId} and co.tenant_id = #{tenantId} - - and c.type = #{type} - - - and c.type < 5 - AND co.coupon_order_status = #{couponOrderStatus} @@ -524,7 +526,7 @@ - co.id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, + co.id,co.coupon_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price, c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit, json_extract(car.vendor_params,'$.id') as coupon_free_id @@ -555,19 +557,15 @@ - -