diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java index 267ea9a42..3afea2e6a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java @@ -150,7 +150,7 @@ public class WxCouponSendController extends BaseController { @SystemControllerLog(description = "注券-删除") public ResultData delete(Long id) { logger.debug("[" + getIpAddr() + "] WxCouponSendController::delete"); - WxCouponSend wxCouponSend = wxCouponSendService.getById(id); + WxCouponSend wxCouponSend = wxCouponSendService.getById(id,getTenantInfo().getTenantId()); if (wxCouponSend == null) { return new ResultData(ErrorCode.COUPON_SEND_IS_INVALID); } @@ -168,7 +168,7 @@ public class WxCouponSendController extends BaseController { @SystemControllerLog(description = "注券-查询") public ResultData findById(Long id) { logger.debug("[" + getIpAddr() + "] WxCouponSendController::findById"); - return new ResultData(Result.SUCCESS, "查询成功", wxCouponSendService.getById(id)); + return new ResultData(Result.SUCCESS, "查询成功", wxCouponSendService.getById(id,getTenantInfo().getTenantId())); } diff --git a/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java b/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java index 9083d471d..52600152b 100644 --- a/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java +++ b/mallinkService/src/main/java/com/iformall/config/BaseMyBatisConfiguration.java @@ -98,6 +98,13 @@ public class BaseMyBatisConfiguration { wxCouponOrderSharding.setRule(EnumShardingRule.HASH.getCode()); shardingList.add(wxCouponOrderSharding); + ShardingSphere wxCouponSendSharding = new ShardingSphere(); + wxCouponSendSharding.setColumn("tenant_id"); + wxCouponSendSharding.setTableName("wx_coupon_send"); + wxCouponSendSharding.setCount(100); + wxCouponSendSharding.setRule(EnumShardingRule.HASH.getCode()); + shardingList.add(wxCouponSendSharding); + ShardingSphere wxOrderGroupSharding = new ShardingSphere(); wxOrderGroupSharding.setColumn("tenant_id"); wxOrderGroupSharding.setTableName("wx_order_group"); diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendMapper.java index 82b322a85..0d6675079 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponSendMapper.java @@ -8,6 +8,10 @@ import org.apache.ibatis.annotations.Param; public interface WxCouponSendMapper extends CommonMapper { + WxCouponSend selectById(@Param("id")Long id,@Param("tenantId")String tenantId); + + int deleteById(@Param("id")Long id,@Param("tenantId")String tenantId); + List findListVo(WxCouponSend wxCouponSend); List findListVoByValidType(WxCouponSend wxCouponSend); @@ -25,7 +29,7 @@ public interface WxCouponSendMapper extends CommonMapper { * @param merchantSend 当前已发数 * @param number 减少数量 */ - Integer reduceMerchantSend(Long id, Integer merchantRemain,Integer merchantSend,Integer number); + Integer reduceMerchantSend(@Param("tenantId")String tenantId,@Param("id")Long id, @Param("merchantRemain")Integer merchantRemain,@Param("merchantSend")Integer merchantSend,@Param("number")Integer number); /** * 商户注券 库存退回 @@ -35,6 +39,6 @@ public interface WxCouponSendMapper extends CommonMapper { * @param merchantSend 当前已发数 * @param number 回退数量 */ - Integer backMerchantSend(Long id, Integer merchantRemain, Integer merchantSend,Integer number); + Integer backMerchantSend(@Param("tenantId")String tenantId,@Param("id")Long id, @Param("merchantRemain")Integer merchantRemain,@Param("merchantSend")Integer merchantSend,@Param("number")Integer number); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java index 56590c894..c4b75e144 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponSendService.java @@ -25,7 +25,7 @@ public interface WxCouponSendService { * @param id * @return */ - WxCouponSend getById(Long id); + WxCouponSend getById(Long id,String tenantId); /** * 保存或更新实体 @@ -45,7 +45,7 @@ public interface WxCouponSendService { * * @param id */ - void deleteById(Long id); + void deleteById(Long id,String tenantId); /** *停车或核销给用户注入卡券 @@ -80,7 +80,7 @@ public interface WxCouponSendService { * @param merchantSend 当前已发 * @param number 减少数量 */ - void reduceMerchantSend(Long id, Integer merchantRemain, Integer merchantSend ,Integer number); + void reduceMerchantSend(String tenantId,Long id, Integer merchantRemain, Integer merchantSend ,Integer number); /** * 商户注券 库存退回 @@ -90,7 +90,7 @@ public interface WxCouponSendService { * @param merchantSend 当前已发 * @param number 回退数量 */ - void backMerchantRemainInventory(Long id, Integer merchantRemain, Integer merchantSend ,Integer number); + void backMerchantRemainInventory(String tenantId,Long id, Integer merchantRemain, Integer merchantSend ,Integer number); /** * 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 5d0f4fd60..82340f549 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -109,8 +109,8 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { } @Override - public WxCouponSend getById(Long id) { - return wxCouponSendMapper.selectById(id); + public WxCouponSend getById(Long id,String tenantId) { + return wxCouponSendMapper.selectById(id,tenantId); } @Transactional(propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) @@ -217,8 +217,8 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { } @Override - public void deleteById(Long id) { - wxCouponSendMapper.deleteById(id); + public void deleteById(Long id,String tenantId) { + wxCouponSendMapper.deleteById(id,tenantId); } private boolean isConditionAllowed(WxCouponSend wxCouponSend, Object param) { @@ -609,16 +609,16 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { } @Override - public void reduceMerchantSend(Long id, Integer merchantRemain, Integer merchantSend ,Integer number) { - int num = wxCouponSendMapper.reduceMerchantSend(id, merchantRemain, merchantSend,number); + public void reduceMerchantSend(String tenantId,Long id, Integer merchantRemain, Integer merchantSend ,Integer number) { + int num = wxCouponSendMapper.reduceMerchantSend(tenantId,id, merchantRemain, merchantSend,number); if (num == 0) { throw new MallinkException(ErrorCode.ORDER_IS_FAIL); } } @Override - public void backMerchantRemainInventory(Long id, Integer merchantRemain, Integer merchantSend, Integer number) { - int num = wxCouponSendMapper.backMerchantSend(id, merchantRemain, merchantSend,number); + public void backMerchantRemainInventory(String tenantId,Long id, Integer merchantRemain, Integer merchantSend, Integer number) { + int num = wxCouponSendMapper.backMerchantSend(tenantId,id, merchantRemain, merchantSend,number); if (num == 0) { throw new MallinkException(ErrorCode.ORDER_IS_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 f5f84f1cc..39e377ae0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -568,7 +568,7 @@ public class WxOrderServiceImpl implements WxOrderService { try { // 减库存 - wxCouponSendService.reduceMerchantSend(wxCouponSendVo.getId(), merchantRemain, merchantSend, 1); + wxCouponSendService.reduceMerchantSend(coupon.getTenantId(),wxCouponSendVo.getId(), merchantRemain, merchantSend, 1); } catch (RuntimeException e) { logger.error("此券减库存失败, couponId: {}, error: {}", couponIdStr, e.getMessage()); throw new MallinkException(ErrorCode.ORDER_IS_FAIL.getCode(), coupon.getTitle() + ErrorCode.ORDER_IS_LIMITED.getMessage()); diff --git a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml index 17414672a..b79c11a81 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponSendMapper.xml @@ -99,6 +99,14 @@ + + + + delete from wx_coupon_send cs where cs.id = #{id} and cs.tenant_id = #{tenantId} + +