From 7a252fa1b084433bcd8c1525c97b43bcf3ddff85 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Fri, 27 Sep 2019 22:32:50 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BA=93=E5=AD=98][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=BA=93=E5=AD=98=E4=BF=AE=E6=94=B9,=E9=98=B2=E6=AD=A2?= =?UTF-8?q?=E5=86=99=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/iformall/service/WxCouponService.java | 8 ++++---- .../iformall/service/impl/WxCouponSendServiceImpl.java | 4 ++-- .../com/iformall/service/impl/WxCouponServiceImpl.java | 4 ++-- .../com/iformall/service/impl/WxOrderServiceImpl.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index 308922c7a..63c3b7d57 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -209,18 +209,18 @@ public interface WxCouponService { * 库存减少 * * @param id 券ID - * @param remainInventory 当前库存 * @param number 减少数量 + * @param remainInventory 当前库存 */ - void reduceRemainInventory(Long id, Integer remainInventory, Integer number); + void reduceRemainInventory(Long id, Integer number, Integer remainInventory); /** * 库存退回 * * @param id 券ID - * @param remainInventory 当前库存 * @param number 回退数量 + * @param remainInventory 当前库存 */ - void backRemainInventory(Long id, Integer remainInventory, Integer number); + void backRemainInventory(Long id, Integer number, Integer remainInventory); } 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 bd1efb798..a39e095b8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -179,7 +179,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { } //更新库存 - wxCouponService.reduceRemainInventory(wxCouponOfDb.getId(), wxCouponOfDb.getRemainInventory(), merchantLnventory); + wxCouponService.reduceRemainInventory(wxCouponOfDb.getId(), merchantLnventory, wxCouponOfDb.getRemainInventory()); } @Override @@ -208,7 +208,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { } //退回coupon库存 if(merchantRemain!=0) { - wxCouponService.backRemainInventory(queryById.getId(), wxCouponOfDb.getRemainInventory(), merchantRemain); + wxCouponService.backRemainInventory(queryById.getId(), merchantRemain, wxCouponOfDb.getRemainInventory()); } } wxCouponSendMapper.updateById(record); 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 e260fa13c..dc7a41af3 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -668,7 +668,7 @@ import java.util.stream.Collectors; @Override @Transactional(isolation= Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) - public void reduceRemainInventory(Long id, Integer remainInventory, Integer number) { + public void reduceRemainInventory(Long id, Integer number, Integer remainInventory) { int num = wxCouponMapper.reduceInventory(id, number, remainInventory); if (num == 0) { throw new MallinkException(ErrorCode.ORDER_SAVE_ERR); @@ -677,7 +677,7 @@ import java.util.stream.Collectors; @Override @Transactional(isolation= Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) - public void backRemainInventory(Long id, Integer remainInventory, Integer number) { + public void backRemainInventory(Long id, Integer number, Integer remainInventory) { int num = wxCouponMapper.backInventory(id, number, remainInventory); if (num == 0) { throw new MallinkException(ErrorCode.REMAIN_BACK_FAIL); 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 f959550f7..b7b352d12 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -513,7 +513,7 @@ public class WxOrderServiceImpl implements WxOrderService { } try { - wxCouponMapper.backInventory(coupon.getId(), coupon.getRemainInventory(), 1); + wxCouponMapper.backInventory(coupon.getId(), 1, coupon.getRemainInventory()); } catch (Exception e) { logger.error("数据库更新失败,库存+1失败, e:" + e.getMessage()); throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "库存恢复失败");