From 3d5547af95b7e6c8755ba23216dc49a16ec49803 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Thu, 16 Aug 2018 15:14:22 +0800 Subject: [PATCH] =?UTF-8?q?[IdWorker=E6=95=B4=E7=90=86][=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?]:IdWorker=E8=B0=83=E7=94=A8=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/simple/controller/WxCouponOrderController.java | 4 ++-- .../java/com/simple/service/WxCouponOrderService.java | 8 ++++---- .../simple/service/impl/MallPermissionServiceImpl.java | 3 ++- .../service/impl/WxCUserBasicInfoServiceImpl.java | 2 +- .../simple/service/impl/WxCouponOrderServiceImpl.java | 10 +++++----- .../service/impl/WxDateAmountRecordServiceImpl.java | 2 +- .../com/simple/service/impl/WxOrderServiceImpl.java | 1 + .../com/simple/service/impl/WxPayOrderServiceImpl.java | 2 +- 8 files changed, 17 insertions(+), 15 deletions(-) diff --git a/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java index 62623aabd..94dde5fec 100644 --- a/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/simple/controller/WxCouponOrderController.java @@ -88,7 +88,7 @@ public class WxCouponOrderController extends BaseController logger.error("couponOrderId参数不正确: " + paramMap.toString()); return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "couponOrderId参数不正确"); } - return wxCouponOrderService.verify(couponOrderId, getUser()); + return wxCouponOrderService.verify(couponOrderId, getUser().getId()); } @ApiOperation(value = "退券接口", notes = "{\"couponOrderId\":\"string\"}") @@ -108,6 +108,6 @@ public class WxCouponOrderController extends BaseController logger.error("couponOrderId参数不正确: " + paramMap.toString()); return new ResultData(ErrorCode.PARAMETER_NOT_NULL.getCode(), "couponOrderId参数不正确"); } - return wxCouponOrderService.refund(couponOrderId, getUser()); + return wxCouponOrderService.refund(couponOrderId, getUser().getId()); } } diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java index a98520c62..897e2a2fe 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java @@ -44,17 +44,17 @@ public interface WxCouponOrderService { * 根据主键couponOrderId(券码)核销 * * @param couponOrderId - * @param bUser 核销人(登录用户) + * @param bUserId 核销人(登录用户) */ - ResultData verify(Long couponOrderId, WxMerchantBUser bUser); + ResultData verify(Long couponOrderId, Long bUserId); /** * 根据主键couponOrderId(券码)退券(款) * * @param couponOrderId - * @param bUser 退券(款)人(登录用户) + * @param bUserId 退券(款)人(登录用户) */ - ResultData refund(Long couponOrderId, WxMerchantBUser bUser); + ResultData refund(Long couponOrderId, Long bUserId); diff --git a/mallinkService/src/main/java/com/simple/service/impl/MallPermissionServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/MallPermissionServiceImpl.java index 6bf23751c..466be284d 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/MallPermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/MallPermissionServiceImpl.java @@ -32,7 +32,8 @@ public class MallPermissionServiceImpl implements MallPermissionService { public void saveOrUpdate(MallPermission record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - record.setId(new IdWorker(0, 0).nextId()); + final IdWorker idWorker = IdWorker.get(); + record.setId(idWorker.nextId()); mallPermissionMapper.insertSelective(record); } else { mallPermissionMapper.updateByPrimaryKeySelective(record); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java index 66f172cd9..aad9d9abc 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCUserBasicInfoServiceImpl.java @@ -31,7 +31,7 @@ public class WxCUserBasicInfoServiceImpl implements WxCUserBasicInfoService { public void saveOrUpdate(WxCUserBasicInfo record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxCUserBasicInfoMapper.insertSelective(record); } else { 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 94c67fcb3..b47b9e890 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java @@ -43,7 +43,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { public void saveOrUpdate(WxCouponOrder record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxCouponOrderMapper.insertSelective(record); } else { @@ -60,7 +60,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) - public ResultData verify(Long couponOrderId, WxMerchantBUser bUser) { + public ResultData verify(Long couponOrderId, Long bUserId) { WxCouponOrder wxCouponOrder = wxCouponOrderMapper.selectByPrimaryKey(couponOrderId); if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_OVER_TIME.getCode()) { logger.error("已过期: couponOrder-" + couponOrderId); @@ -76,7 +76,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } try { wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); //1核销 - wxCouponOrder.setBUserId(bUser.getId()); + wxCouponOrder.setBUserId(bUserId); wxCouponOrder.setUpdateDate(new Date()); wxCouponOrderMapper.updateByPrimaryKeySelective(wxCouponOrder); } catch (Exception e) { @@ -90,7 +90,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) - public ResultData refund(Long couponOrderId, WxMerchantBUser bUser) { + public ResultData refund(Long couponOrderId, Long bUserId) { WxCouponOrder wxCouponOrder = wxCouponOrderMapper.selectByPrimaryKey(couponOrderId); if (wxCouponOrder.getCouponOrderStatus().equals(EnumCouponOrderStatus.COUPON_ORDER_OVER_TIME.getCode())) { @@ -107,7 +107,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } try { wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_INVALID.getCode()); //3退款,券作废 - wxCouponOrder.setBUserId(bUser.getId()); + wxCouponOrder.setBUserId(bUserId); wxCouponOrder.setUpdateDate(new Date()); wxCouponOrderMapper.updateByPrimaryKeySelective(wxCouponOrder); } catch (Exception e) { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxDateAmountRecordServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxDateAmountRecordServiceImpl.java index 71733e067..e5761b636 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxDateAmountRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxDateAmountRecordServiceImpl.java @@ -31,7 +31,7 @@ public class WxDateAmountRecordServiceImpl implements WxDateAmountRecordService public void saveOrUpdate(WxDateAmountRecord record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxDateAmountRecordMapper.insertSelective(record); } else { diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java index 98f08bb9f..4306270ac 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxOrderServiceImpl.java @@ -174,6 +174,7 @@ public class WxOrderServiceImpl implements WxOrderService { try { WxCouponOrder couponOrder = new WxCouponOrder(); couponOrder.setId(idWorker.nextId()); + couponOrder.setTenantId(user.getTenantId()); couponOrder.setCouponId(couponId); couponOrder.setCUserId(user.getId()); couponOrder.setOrderId(orderNumber); diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java index cc03b86a8..c1bb5393f 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java @@ -401,7 +401,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { public void saveOrUpdate(WxPayOrder record) { if (record.getId() == null) { //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - IdWorker idWorker = new IdWorker(0, 0); + final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); wxPayOrderMapper.insertSelective(record); } else {