From da33cf73fd1c3acbcaab625209b409843e40760d Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Mon, 22 Oct 2018 17:05:14 +0800 Subject: [PATCH] =?UTF-8?q?[C=E7=AB=AF=E9=A2=86=E5=8F=96=E5=88=B8=E8=AE=B0?= =?UTF-8?q?=E5=BD=95couponActionLog][=E6=96=B0=E5=A2=9E]:C=E7=AB=AF?= =?UTF-8?q?=E9=A2=86=E5=8F=96=E5=88=B8=E8=AE=B0=E5=BD=95=E5=88=B0couponAct?= =?UTF-8?q?ionLog,order=5Fid->coupon=5Forder=5Fid,coupon=5Fchannel=5Fid->c?= =?UTF-8?q?hannel=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxOrderController.java | 8 +++----- .../java/com/iformall/service/WxOrderService.java | 2 +- .../iformall/service/impl/WxOrderServiceImpl.java | 14 +++++++++++++- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index 8bc8cd19d..79d42ece6 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -91,15 +91,13 @@ public class WxOrderController extends BaseController { //Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名"); String couponChannelIdStr = paramMap.get("couponChannelId"); String couponIdStr = paramMap.get("couponId"); - /* - // TODO 修改支持banner图,获取不到couponChannelId问题 + if (StringUtils.isBlank(couponChannelIdStr)) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponChannelId不能为空"); } - */ Long couponChannelId = 0L, couponId = 0L; - if (!StringUtils.isBlank(couponChannelIdStr)) { + if (StringUtils.isNotBlank(couponChannelIdStr)) { try { couponChannelId = Long.valueOf(couponChannelIdStr); } catch (NumberFormatException e) { @@ -136,7 +134,7 @@ public class WxOrderController extends BaseController { WxCUser user = getUser(); try { - WxOrder order = wxOrderService.saveOrder(user, couponId); + WxOrder order = wxOrderService.saveOrder(user, couponChannelId, couponId); return new ResultData(order); } catch (MallinkException e) { logger.error(e.getMessage()); diff --git a/mallinkService/src/main/java/com/iformall/service/WxOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxOrderService.java index 26e4063e2..86dc9525b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxOrderService.java @@ -29,7 +29,7 @@ public interface WxOrderService { * @param couponId * @return 订单id */ - WxOrder saveOrder(WxCUser user, Long couponId); + WxOrder saveOrder(WxCUser user, Long couponChannelId, Long couponId); /** * 免费券订单接口 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index 4a7915daf..945a26d3e 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -69,6 +69,9 @@ public class WxOrderServiceImpl implements WxOrderService { @Autowired WxCUserTagsService wxCUserTagsService; + @Autowired + WxCouponActionLogService wxCouponActionLogService; + @Override public PageInfo listAsPage(WxOrder record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxOrderMapper.findList(record)); @@ -209,7 +212,7 @@ public class WxOrderServiceImpl implements WxOrderService { @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) - public WxOrder saveOrder(WxCUser user, Long couponId) { + public WxOrder saveOrder(WxCUser user, Long couponChannelId, Long couponId) { // 检查用户 if (user == null) { logger.error("用户不存在"); @@ -283,6 +286,15 @@ public class WxOrderServiceImpl implements WxOrderService { throw new MallinkException(ErrorCode.ORDER_SAVE_ERR); } + // couponActionLog + try { + wxCouponActionLogService.addOne(user.getTenantId(), couponId, orderNumber, EnumCouponSendSendType.ACTIVE.getCode(), couponChannelId); + } catch (Exception e) { + logger.error("保存订单:" + e.getMessage()); + throw new MallinkException(ErrorCode.ORDER_SAVE_ERR); + } + + return record; }