From 4fea3d11a6e92958bb35bd8486d53c6a28464c82 Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 18 Jan 2019 14:02:51 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8D=A1=E5=88=B8][=E6=9B=B4=E6=94=B9]:?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E5=8D=A1=E5=88=B8=E8=B4=AD=E4=B9=B0=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/schedule/CouponSendSchedule.java | 4 +- .../com/iformall/mapper/WxOrderMapper.java | 2 - .../com/iformall/service/WxCouponService.java | 2 - .../impl/WxCouponInjectServiceImpl.java | 7 +-- .../service/impl/WxCouponSendServiceImpl.java | 1 - .../service/impl/WxCouponServiceImpl.java | 6 --- .../service/impl/WxOrderServiceImpl.java | 43 +++++++------------ .../mapper/WxCouponActionLogMapper.xml | 1 + .../resources/mapper/WxCouponOrderMapper.xml | 17 -------- .../main/resources/mapper/WxOrderMapper.xml | 20 --------- 10 files changed, 24 insertions(+), 79 deletions(-) diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java index 5b82519dc..f178f29fa 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponSendSchedule.java @@ -133,7 +133,9 @@ public class CouponSendSchedule { params.put("cUserId", cu.getId()); params.put("couponId", cs.getCouponId()); params.put("startTime", startTime); - params.put("endTime", endTime ); + params.put("endTime", endTime); + params.put("channelType", EnumCouponSendSendType.TIMED.getCode()); + int sentCount = wxCouponActionLogMapper.getCountByUserAndCouponAndDate(params); logger.info("定时发券:给["+ cu.getNickName() + diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java index de31e302e..5e029389e 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxOrderMapper.java @@ -14,8 +14,6 @@ public interface WxOrderMapper extends CommonMapper { Integer countList(WxOrder wxOrder); - Integer dayCountList(WxOrder wxOrder); - List findListOfUnpaidOrderByDate(Map dateMap); List findListOfUnpaidPressOrderByDate(Map dateMap); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index b6379dc55..bdda8f34a 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -44,6 +44,4 @@ public interface WxCouponService { void deleteById(Long id); - void reduceInventory(Long id,Integer number); - } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java index 77e0103bd..bf3b6d8a7 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java @@ -237,13 +237,14 @@ public class WxCouponInjectServiceImpl implements WxCouponInjectService { WxCouponOrder couponOrder = null; try { couponOrder = wxOrderService.sendFreeCouponToUser(tempCUser.getId(), wxCoupon.getId()); + if (couponOrder != null) { + wxCouponActionLogService.addOne(tempCUser.getTenantId(), wxCoupon.getId(), couponOrder.getId(), EnumCouponSendSendType.INJECT.getCode(), couponInjectId); + } } catch (MallinkException e) { logger.error(e.getMessage()); return false; } - if (couponOrder != null) { - wxCouponActionLogService.addOne(tempCUser.getTenantId(), wxCoupon.getId(), couponOrder.getId(), EnumCouponSendSendType.INJECT.getCode(), couponInjectId); - } + return true; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index 464ab2112..3819540ea 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -186,7 +186,6 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { wxCouponActionLogService.addOne(tenantId, send.getCouponId(), couponOrder.getId(), type.getCode(), send.getId()); bRet = true; } - // wxCouponService.reduceInventory(send.getCouponId(), 1); } catch (Exception e) { logger.error(e.getMessage()); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index eae37befa..654b8fe79 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -246,10 +246,4 @@ public class WxCouponServiceImpl implements WxCouponService { wxCouponMapper.deleteByPrimaryKey(id); } - @Override - public void reduceInventory(Long id, Integer number) { - wxCouponMapper.reduceInventory(id,number); - } - - } 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 d82982a44..eacc31382 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -172,38 +172,28 @@ public class WxOrderServiceImpl implements WxOrderService { // + Order 待支付 // + couponOrder ---待使用 int countOrder = 0, countCouponOrder = 0; - WxOrder orderQ = new WxOrder(); - orderQ.setTenantId(user.getTenantId()); - orderQ.setProductId(counpon.getId()); - orderQ.setType(EnumOrderType.COUPON.getCode()); - orderQ.setcUserId(user.getId()); - orderQ.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); + try { - if (counpon.getType().equals(EnumCouponType.COUPON_TINGCHE.getCode())) { - countOrder = wxOrderMapper.dayCountList(orderQ); - } else { - countOrder = wxOrderMapper.countList(orderQ); - } + WxOrder orderQ = new WxOrder(); + orderQ.setTenantId(user.getTenantId()); + orderQ.setProductId(counpon.getId()); + orderQ.setType(EnumOrderType.COUPON.getCode()); + orderQ.setcUserId(user.getId()); + orderQ.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); + countOrder = wxOrderMapper.countList(orderQ); } catch (Exception e) { logger.error("购买是否超限-DB, couponId: " + counpon.getId() + ", e:" + e.getMessage()); throw new MallinkException(ErrorCode.ORDER_IS_FAIL); } try { - if (counpon.getType().equals(EnumCouponType.COUPON_TINGCHE.getCode())) { - // 停车券 每日限领1张 - Map params = new HashMap(); - params.put("couponId", counpon.getId()); - params.put("cUserId", user.getId()); - countCouponOrder = wxCouponOrderMapper.dayCountCarList(params); - } else { - WxCouponOrder couponOrderQ = new WxCouponOrder(); - couponOrderQ.setTenantId(user.getTenantId()); - couponOrderQ.setCouponId(counpon.getId()); - couponOrderQ.setCUserId(user.getId()); - //////couponOrderQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); - countCouponOrder = wxCouponOrderMapper.countList(couponOrderQ); - } + WxCouponOrder couponOrderQ = new WxCouponOrder(); + couponOrderQ.setTenantId(user.getTenantId()); + couponOrderQ.setCouponId(counpon.getId()); + couponOrderQ.setCUserId(user.getId()); + if (counpon.getSendType().equals(EnumCouponSendType.PASSIVE)) + couponOrderQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); + countCouponOrder = wxCouponOrderMapper.countList(couponOrderQ); } catch (Exception e) { logger.error("购买是否超限-DB, couponId: " + counpon.getId() + ", e:" + e.getMessage()); throw new MallinkException(ErrorCode.ORDER_IS_FAIL); @@ -249,8 +239,7 @@ public class WxOrderServiceImpl implements WxOrderService { try { // 减库存 - coupon.setRemainInventory(coupon.getRemainInventory() - 1); - wxCouponMapper.updateByPrimaryKeySelective(coupon); + wxCouponMapper.reduceInventory(coupon.getId(), 1); //解锁 redisLock.unlock(couponIdStr, timeStr); } catch (RuntimeException e) { diff --git a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml index 0886d5f1a..7c2644fe6 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponActionLogMapper.xml @@ -188,6 +188,7 @@ AND a.tenant_id = #{tenantId} AND o.c_user_id = #{cUserId} AND a.coupon_id = #{couponId} + AND a.channel_type = #{channelType} and a.create_time >= #{startTime} and a.create_time <= #{endTime} diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 36a15a6ab..d93e1e4da 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -94,23 +94,6 @@ - -