From fc3131a3c08adbe521882e04f3af4c5f79d041d8 Mon Sep 17 00:00:00 2001 From: hupeng Date: Sat, 25 Aug 2018 17:07:03 +0800 Subject: [PATCH] =?UTF-8?q?[B=E7=AB=AF][=E6=B7=BB=E5=8A=A0]:=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=88=B8=E8=AF=A6=E6=83=85=E8=8E=B7=E5=8F=96=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxCouponOrderController.java | 15 ++++++++++ .../simple/service/WxCouponOrderService.java | 7 +++++ .../impl/WxCouponOrderServiceImpl.java | 22 +++++++++++++++ .../resources/mapper/WxCouponOrderMapper.xml | 28 +++++++++++++++---- 4 files changed, 67 insertions(+), 5 deletions(-) diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java index 59f1d9e1c..8775eb69e 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java @@ -87,6 +87,21 @@ public class WxCouponOrderController extends BaseController { return wxCouponOrderService.listOnDateAsPage(getUser().getId(), date, null, null, true); } + + @ApiOperation(value = "卡券详情接口") + @GetMapping("detail") + @ApiImplicitParams({ + @ApiImplicitParam(name = "couponOrderId", value = "券ID", dataType = "string", paramType = "query", required = true) + }) + public ResultData detail(String couponOrderId) { + + if(couponOrderId == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + + return new ResultData(wxCouponOrderService.detailBUserVo(getUser().getId(), couponOrderId)); + } + @ApiOperation(value = "核销接口", notes = "{\"couponOrderId\":\"string\"}") @PostMapping("verify") public ResultData verify(@RequestBody Map paramMap) { diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java index d293d3772..10f184b42 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java @@ -88,4 +88,11 @@ public interface WxCouponOrderService { * @param bUserId C端用户 */ ResultData detailCUserVo(Long cUserId, String couponOrderId); + + /** + * B用户查券详情 + * + * @param bUserId B端用户 + */ + ResultData detailBUserVo(Long bUserId, String couponOrderId); } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java index 869aeb26b..721440aab 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java @@ -182,6 +182,28 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { return new ResultData(wxCouponOrderMapper.selectDetailOfCUser(paramMap)); } + @Override + public ResultData detailBUserVo(Long bUserId, String couponOrderId) { + WxMerchantBUser wxMerchantBUser = wxMerchantBUserMapper.selectByPrimaryKey(bUserId); + if(wxMerchantBUser == null){ + logger.error("用户不存在:"+ bUserId); + throw new MallinkException(ErrorCode.USER_IS_EMPTY); + } + + WxMerchant wxMerchant = wxMerchantMapper.selectByPrimaryKey(wxMerchantBUser.getMerchantId()); + if (wxMerchant == null) { + logger.error("商户不存在:" + bUserId); + throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); + } + + Map paramMap = new HashMap(); + paramMap.put("merchantId", wxMerchant.getId()); + paramMap.put("tenantId", wxMerchant.getTenantId()); + paramMap.put("couponOrderId", couponOrderId); + + return new ResultData(wxCouponOrderMapper.selectDetailOfCUser(paramMap)); + } + @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 0f335fc96..57556b533 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -257,8 +257,16 @@