diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java index 4d9205386..fe0dca468 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCampaignController.java @@ -125,7 +125,7 @@ public class WxCampaignController extends BaseController { for (String couponIdStr : ids) { Long couponId = Long.parseLong(couponIdStr); - WxCoupon wxCoupon = wxCouponService.getById(couponId); + WxCoupon wxCoupon = wxCouponService.getById(couponId,campaign.getTenantId()); if (wxCoupon == null) { return new ResultData(ErrorCode.COUPON_IS_EMPTY); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index e1109293e..4ea10b5d9 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -147,7 +147,7 @@ public class WxCouponController extends BaseController { } } - WxCoupon coupon = wxCouponService.getById(wxCoupon.getId()); + WxCoupon coupon = wxCouponService.getById(wxCoupon.getId(),wxCoupon.getTenantId()); if (null == coupon) { return new ResultData(ResultData.ERROR, "券未查询到。"+wxCoupon.getId()); } @@ -289,7 +289,7 @@ public class WxCouponController extends BaseController { @SystemControllerLog(description = "券投放-删除") public ResultData delete(Long id) { logger.debug("[" + getIpAddr() + "] WxCouponController::delete"); - wxCouponService.deleteById(id); + wxCouponService.deleteById(id,getTenantInfo().getTenantId()); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -299,7 +299,7 @@ public class WxCouponController extends BaseController { @SystemControllerLog(description = "券投放-查询") public ResultData findById(@RequestParam Long id) { logger.debug("[" + getIpAddr() + "] WxCouponController::findById"); - return new ResultData(wxCouponService.getVoById(id)); + return new ResultData(wxCouponService.getVoById(id,getTenantInfo().getTenantId())); } @@ -395,7 +395,7 @@ public class WxCouponController extends BaseController { @SystemControllerLog(description = "券投放-富文本获取") public ResultData getHtml(@RequestParam Long id) { logger.debug("[" + getIpAddr() + "] WxCouponController::getHtmlById"); - return new ResultData(wxCouponService.getHtmlById(id)); + return new ResultData(wxCouponService.getHtmlById(id,getTenantInfo().getTenantId())); } @ApiOperation("卡延期") @@ -409,7 +409,7 @@ public class WxCouponController extends BaseController { return new ResultData(ResultData.ERROR, "缺少validEndDate"); } - return new ResultData(wxCouponService.cardDefer(wxCoupon.getId(),wxCoupon.getValidEndDate())); + return new ResultData(wxCouponService.cardDefer(wxCoupon.getId(),getTenantInfo().getTenantId(),wxCoupon.getValidEndDate())); } } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java index 6bd58000b..0ba38e4a3 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java @@ -97,7 +97,7 @@ public class WxCouponPresentController extends BaseController { logger.error(e.getMessage()); return new ResultData(e.getErrorCode(), e.getMessage()); } - WxCoupon wxCoupon = wxCouponService.getById(wxCouponPresent.getCouponId()); + WxCoupon wxCoupon = wxCouponService.getById(wxCouponPresent.getCouponId(),wxCouponPresent.getTenantId()); if (wxCoupon.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME.getCode())) { //时间范围 if (new Date().after(wxCoupon.getValidEndDate())) { return new ResultData(ErrorCode.COUPON_IS_EXPIRED); 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 52d4bf843..267ea9a42 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java @@ -106,7 +106,7 @@ public class WxCouponSendController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); } - WxCoupon wxCoupon = wxCouponService.getById(wxCouponSend.getCouponId()); + WxCoupon wxCoupon = wxCouponService.getById(wxCouponSend.getCouponId(),getTenantInfo().getTenantId()); if (!EnumCouponStatus.COUPON_STATUS_THROW_IN.getCode().equals(wxCoupon.getStatus())) { return new ResultData(ErrorCode.COUPON_IS_TAKE_OFF); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java index 17d21c258..b6290ce5e 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOrderController.java @@ -180,7 +180,7 @@ public class WxOrderController extends BaseController { user.setOperatorType(EnumUserType.MALLUSER.getCode()); user.setOperatorId(getUserId()); WxOrder order = null; - WxCoupon coupon = wxCouponService.getById(couponId); + WxCoupon coupon = wxCouponService.getById(couponId,wxCouponChannel.getTenantId()); if (coupon == null) { return new ResultData(ErrorCode.COUPON_IS_EMPTY); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java index d2df602d6..b544fefdf 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java @@ -101,7 +101,7 @@ public class MemCouponController extends BaseController { memCouponFromDsp.setCouponId(couponChannel.getCouponId()); } // 1. 检查券是否已超限, 无剩余库存 - WxCoupon coupon = couponService.getById(memCouponFromDsp.getCouponId()); + WxCoupon coupon = couponService.getById(memCouponFromDsp.getCouponId(),memCouponFromDsp.getTenantId()); if (coupon == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "券不存在:" + memCouponFromDsp.getCouponId()); } @@ -144,7 +144,7 @@ public class MemCouponController extends BaseController { memCouponFromDsp.setCouponId(couponChannel.getCouponId()); } // 1. 检查券是否已超限, 无剩余库存 - WxCoupon coupon = couponService.getById(memCouponFromDsp.getCouponId()); + WxCoupon coupon = couponService.getById(memCouponFromDsp.getCouponId(),couponChannel.getTenantId()); if (coupon == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "券不存在:" + memCouponFromDsp.getCouponId()); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java index 9f030cd98..6ee97355c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/WxCUserBasicInfoController.java @@ -246,7 +246,7 @@ public class WxCUserBasicInfoController extends BaseController { if (page.getSize() > 0) { List list = page.getList(); for (WxCouponOrder c : list) { - WxCoupon coupon = wxCouponService.getById(c.getCouponId()); + WxCoupon coupon = wxCouponService.getById(c.getCouponId(),c.getTenantId()); c.setCouponName(coupon.getTitle()); c.setSalePrice(coupon.getPrice()); @@ -276,7 +276,7 @@ public class WxCUserBasicInfoController extends BaseController { //if (page.getSize() > 0) { List list = page.getList(); for (WxCouponOrder c : list) { - WxCoupon coupon = wxCouponService.getById(c.getCouponId()); + WxCoupon coupon = wxCouponService.getById(c.getCouponId(),c.getTenantId()); c.setCouponName(coupon.getTitle()); c.setSalePrice(coupon.getPrice()); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java index 89263d283..1169d4a53 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -164,7 +164,7 @@ public class WxCouponController extends BaseController { if (wxCoupon.getId() == null) { return new ResultData(ResultData.ERROR, "缺少id"); } - WxCoupon coupon = wxCouponService.getById(wxCoupon.getId()); + WxCoupon coupon = wxCouponService.getById(wxCoupon.getId(),getTenantInfo().getTenantId()); if(coupon.getSourceType().intValue() != EnumCouponSourceType.COUPONSource_Bapi.getCode().intValue()){ return new ResultData(Result.ERROR,"非B端券,不能进行此操作"); @@ -241,7 +241,7 @@ public class WxCouponController extends BaseController { wxCoupon.setMerchantParams(JSONObject.toJSONString(merchantList)); - WxCoupon coupon = wxCouponService.getById(wxCoupon.getId()); + WxCoupon coupon = wxCouponService.getById(wxCoupon.getId(),wxCoupon.getTenantId()); if (null == coupon) { return new ResultData(ResultData.ERROR, "券未查询到。"+wxCoupon.getId()); } @@ -328,7 +328,7 @@ public class WxCouponController extends BaseController { return new ResultData(Result.ERROR,EnumFlowKey.B_COUPON_MERCHANT_CREATE.getMessage()+"未配置审批流程"); } logger.debug("[" + getIpAddr() + "] WxCouponController::delete"); - wxCouponService.deleteById(id); + wxCouponService.deleteById(id,getTenantInfo().getTenantId()); return new ResultData(Result.SUCCESS, "删除成功", null); } @@ -337,7 +337,7 @@ public class WxCouponController extends BaseController { @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData findById(@RequestParam Long id) { logger.debug("[" + getIpAddr() + "] WxCouponController::findById"); - return new ResultData(wxCouponService.getVoById(id)); + return new ResultData(wxCouponService.getVoById(id,getTenantInfo().getTenantId())); } @@ -428,7 +428,7 @@ public class WxCouponController extends BaseController { @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) public ResultData getHtml(@RequestParam Long id) { logger.debug("[" + getIpAddr() + "] WxCouponController::getHtmlById"); - return new ResultData(wxCouponService.getHtmlById(id)); + return new ResultData(wxCouponService.getHtmlById(id,getTenantInfo().getTenantId())); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index ac1657ab7..b8b49f7cc 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -157,7 +157,7 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.COUPON_IS_EMPTY); } } else { - wxCouponCVo = wxCouponService.getVoById(wxCouponOrderCVo.getCouponId()); + wxCouponCVo = wxCouponService.getVoById(wxCouponOrderCVo.getCouponId(),wxMerchantBUser.getTenantId()); if (wxCouponCVo == null) { return new ResultData(ErrorCode.COUPON_IS_EMPTY); } @@ -214,7 +214,7 @@ public class WxCouponOrderController extends BaseController { } wxCouponOrderCVo.setHtml(wxCouponCVo.getHtml()); } else { - WxCoupon wxCoupon = wxCouponService.getHtmlById(wxCouponOrderCVo.getCouponId()); + WxCoupon wxCoupon = wxCouponService.getHtmlById(wxCouponOrderCVo.getCouponId(),wxCouponOrderCVo.getTenantId()); if (wxCoupon == null) { return new ResultData(ErrorCode.COUPON_IS_EMPTY); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java index aa2e68e3d..0dd01a5c2 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java @@ -341,7 +341,7 @@ public class WxCarController extends BaseController { } return new ResultData(Result.SUCCESS,"已经使用过优惠券, 不能重复使用."); } else { - WxCoupon coupon = couponService.getById(userCar.getCouponId()); + WxCoupon coupon = couponService.getById(userCar.getCouponId(),park.getFinalTenantId()); if (coupon == null) { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "券为空"); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index 678e223af..5175bbad5 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -86,7 +86,7 @@ public class WxCouponController extends BaseController { // 库存 if (couponIdL > 0L) { // 更新状态 - WxCouponCVo couponCVo = couponService.getVoStatusById(couponIdL); + WxCouponCVo couponCVo = couponService.getVoStatusById(couponIdL,wxCouponCVo.getTenantId()); if (wxCouponCVo == null) { return new ResultData(ErrorCode.COUPON_IS_EMPTY); } @@ -184,7 +184,7 @@ public class WxCouponController extends BaseController { return null; } - WxCoupon c = couponService.getById(cc.getCouponId()); + WxCoupon c = couponService.getById(cc.getCouponId(),cc.getTenantId()); if (c == null) { return null; } @@ -203,7 +203,7 @@ public class WxCouponController extends BaseController { return null; } - WxCoupon c = couponService.getHtmlById(cc.getCouponId()); + WxCoupon c = couponService.getHtmlById(cc.getCouponId(),cc.getTenantId()); if (c == null) { return null; } @@ -222,7 +222,7 @@ public class WxCouponController extends BaseController { return null; } - WxCoupon c = couponService.getById(cc.getCouponId()); + WxCoupon c = couponService.getById(cc.getCouponId(),cc.getTenantId()); if (c == null) { c = new WxCoupon(); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index ddacb5bac..f50a04cdf 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -140,7 +140,7 @@ public class WxCouponOrderController extends BaseController { return new ResultData(ErrorCode.COUPON_IS_EMPTY); } } else { - wxCouponCVo = wxCouponService.getVoById(wxCouponOrderCVo.getCouponId()); + wxCouponCVo = wxCouponService.getVoById(wxCouponOrderCVo.getCouponId(),wxCouponOrderCVo.getTenantId()); if (wxCouponCVo == null) { return new ResultData(ErrorCode.COUPON_IS_EMPTY); } @@ -209,7 +209,7 @@ public class WxCouponOrderController extends BaseController { wxCouponOrderCVo.setContentType(wxCouponCVo.getContentType()); wxCouponOrderCVo.setHtml(wxCouponCVo.getHtml()); } else { - WxCoupon wxCoupon = wxCouponService.getHtmlById(wxCouponOrderCVo.getCouponId()); + WxCoupon wxCoupon = wxCouponService.getHtmlById(wxCouponOrderCVo.getCouponId(),wxCouponOrderCVo.getTenantId()); if (wxCoupon == null) { return new ResultData(ErrorCode.COUPON_IS_EMPTY); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java index 5b11b2844..5de989ae7 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponPasswordController.java @@ -80,7 +80,7 @@ public class WxCouponPasswordController extends BaseController { throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "会员用户未找到" + memberId); } - WxCoupon coupon = couponService.getById(couponPassword.getCouponId()); + WxCoupon coupon = couponService.getById(couponPassword.getCouponId(),couponPassword.getTenantId()); if (coupon == null) { return new ResultData(ErrorCode.COUPON_IS_EMPTY); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java index 57a0032b4..3838ea530 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java @@ -93,7 +93,7 @@ public class WxOrderController extends BaseController { return new ResultData(ErrorCode.MEMBER_IS_LOCKED); } - WxCoupon coupon = wxCouponService.getById(wxCouponChannel.getCouponId()); + WxCoupon coupon = wxCouponService.getById(wxCouponChannel.getCouponId(),wxCouponChannel.getTenantId()); if (null == coupon) { return new ResultData(ErrorCode.COUPON_IS_EMPTY); } @@ -415,7 +415,7 @@ public class WxOrderController extends BaseController { } WxCoupon wxCoupon = null; try { - wxCoupon = wxCouponService.getById(id); + wxCoupon = wxCouponService.getById(id,getTenantInfo().getTenantId()); } catch (Exception e) { logger.error("券ID获取券信息失败, couponId: " + couponId); return new ResultData(ErrorCode.COUPON_IS_EMPTY); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java index 2eb0054f9..4b40dbc53 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -186,7 +186,7 @@ public class WxPayOrderController extends BaseController { if (null == order) { return new ResultData(ErrorCode.PAY_ORDER_ERROR, "未查询到Order["+orderId+"]."); } - WxCoupon wxCoupon = wxCouponService.getById(order.getProductId()); + WxCoupon wxCoupon = wxCouponService.getById(order.getProductId(),order.getTenantId()); if (null == wxCoupon) { return new ResultData(ErrorCode.PAY_ORDER_ERROR, "未查询到优惠券[orderId:"+orderId+"]."); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java index e7f81ad53..22e8c46a9 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java @@ -113,7 +113,7 @@ public class WxPressOrderController extends BaseController { wxCouponCVo = cdOperations.get(cdKey); } else { // 券信息没有入缓存,需要从数据库中读取 - wxCouponCVo = wxCouponService.getVoById(order.getProductId()); + wxCouponCVo = wxCouponService.getVoById(order.getProductId(),order.getTenantId()); if (wxCouponCVo != null) { // 券详情优化,进缓存 couponCVoRedisTemplate.opsForValue().set(cdKey, wxCouponCVo, 3600, TimeUnit.SECONDS); diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/UpdateCouponStockMsg.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/UpdateCouponStockMsg.java deleted file mode 100644 index 354273ad6..000000000 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/UpdateCouponStockMsg.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.iformall.domain.po.msg; - -import cn.binarywang.wx.miniapp.bean.WxMaTemplateData; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.ToString; - -import java.util.List; -import java.util.Map; - -/** - * 更新券库存消息 - * @author Stormeye - * @date 2019/4/9 13:55 - */ -@Data -@ToString(callSuper = true) -@EqualsAndHashCode(callSuper = true) -public class UpdateCouponStockMsg extends BaseMsg { - private static final long serialVersionUID = 223232132183760321L; - - public static final String OPERATE_TYPE_INCREASE = "increase"; - public static final String OPERATE_TYPE_DECREASE = "decrease"; - - @io.swagger.annotations.ApiModelProperty(value="券Id",name="couponId") - private Long couponId; - @io.swagger.annotations.ApiModelProperty(value="更新数量",name="number") - private long number; - @io.swagger.annotations.ApiModelProperty(value="操作类型 1-增加库存 ,2-减少库存",name="operateType") - private String operateType; -} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java index 3ccfd203f..0e9ace2bf 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponMapper.java @@ -16,13 +16,17 @@ public interface WxCouponMapper extends CommonMapper { List findList(WxCoupon wxCoupon); List findCouponList(WxCoupon wxCoupon); + WxCoupon selectById(@Param("id")Long id,@Param("tenantId")String tenantId); - WxCouponCVo findVoDetail(@Param("id")Long id); - WxCouponCVo findVoStatusDetail(@Param("id")Long id); + WxCouponCVo findVoDetail(@Param("id")Long id,@Param("tenantId")String tenantId); + WxCouponCVo findVoStatusDetail(@Param("id")Long id,@Param("tenantId")String tenantId); + + void deleteById(@Param("id")Long id,@Param("tenantId")String tenantId); + - Integer reduceInventory(@Param("id")Long id,@Param("number")Integer number); + Integer reduceInventory(@Param("id")Long id,@Param("tenantId")String tenantId,@Param("number")Integer number); - Integer backInventory(@Param("id")Long id, @Param("number")Integer number,@Param("remainInventory")Integer remainInventory); + Integer backInventory(@Param("id")Long id,@Param("tenantId")String tenantId, @Param("number")Integer number,@Param("remainInventory")Integer remainInventory); void offExpiriedCouponByValidDate(); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java index 011841b97..f059741ba 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponService.java @@ -52,14 +52,14 @@ public interface WxCouponService { * @param id * @return */ - WxCoupon getById(Long id); + WxCoupon getById(Long id,String tenantId); - WxCoupon getHtmlById(Long id); + WxCoupon getHtmlById(Long id,String tenantId); - WxCouponCVo getVoById(Long id); + WxCouponCVo getVoById(Long id,String tenantId); - WxCouponCVo getVoStatusById(Long id); + WxCouponCVo getVoStatusById(Long id,String tenantId); /** * 保存或更新实体 * @@ -77,7 +77,7 @@ public interface WxCouponService { * * @param id */ - void deleteById(Long id); + void deleteById(Long id,String tenantId); /** @@ -214,7 +214,7 @@ public interface WxCouponService { * @param number 减少数量 * @param remainInventory 当前库存 */ - void reduceRemainInventory(Long id, Integer number); + void reduceRemainInventory(Long id,String tenantId, Integer number); /** * 库存退回 @@ -223,12 +223,12 @@ public interface WxCouponService { * @param number 回退数量 * @param remainInventory 当前库存 */ - void backRemainInventory(Long id, Integer number, Integer remainInventory); + void backRemainInventory(Long id,String tenantId, Integer number, Integer remainInventory); /** * 卡延期 * @param wxCoupon * @return */ - ResultData cardDefer(Long id,Date validEndDate); + ResultData cardDefer(Long id,String tenantId,Date validEndDate); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java index ba2cda6b7..294004a40 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCampaignServiceImpl.java @@ -228,7 +228,7 @@ public class WxCampaignServiceImpl implements WxCampaignService { public void saveOrUpdateCouponChannel(Long couponId, Map wxCouponChannelsMap, WxCampaign record){ - WxCoupon wxCoupon = wxCouponService.getById(couponId); + WxCoupon wxCoupon = wxCouponService.getById(couponId,record.getTenantId()); if (wxCoupon == null) { return; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java index 0b71a678c..560250433 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponChannelServiceImpl.java @@ -89,7 +89,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { if (orignal.getStatus().equals(EnumCouponChannelStatus.STATUS_TAKE_OFFF.getCode()) && record.getStatus().equals(EnumCouponChannelStatus.STATUS_THROW_IN.getCode())) { - WxCoupon wxCoupon = wxCouponService.getById(orignal.getCouponId()); + WxCoupon wxCoupon = wxCouponService.getById(orignal.getCouponId(),orignal.getTenantId()); if (wxCoupon == null) return new ResultData(ErrorCode.COUPON_IS_EMPTY); if (wxCoupon.getStatus().equals(EnumCouponStatus.COUPON_STATUS_TAKE_OFFF)) @@ -214,7 +214,7 @@ public class WxCouponChannelServiceImpl implements WxCouponChannelService { WxCouponChannelAddVo vo = new WxCouponChannelAddVo(); - WxCoupon wxCoupon = wxCouponService.getById(couponid); + WxCoupon wxCoupon = wxCouponService.getById(couponid,tenantEntity.getTenantId()); if(wxCoupon==null){ logger.debug(couponid+ErrorCode.COUPON_IS_EMPTY.getMessage()); vo.toCouponChannnelVo(null,channelId); 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 580e476f4..ea5458c73 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponInjectServiceImpl.java @@ -101,7 +101,7 @@ public class WxCouponInjectServiceImpl implements WxCouponInjectService { return new ResultData(e.getErrorCode(),e.getMessage()); } - WxCoupon wxCoupon = wxCouponService.getById(record.getCouponId()); + WxCoupon wxCoupon = wxCouponService.getById(record.getCouponId(),record.getTenantId()); if (wxCoupon.getValidType().equals(EnumCouponValidType.BETWEEN_TWO_TIME.getCode()) ) { //时间范围 if (new Date().after(wxCoupon.getValidEndDate())) { return new ResultData(ErrorCode.COUPON_IS_EXPIRED); 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 f7841e689..260b686ae 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -181,7 +181,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { } //更新库存 - wxCouponService.reduceRemainInventory(wxCouponOfDb.getId(), merchantLnventory); + wxCouponService.reduceRemainInventory(wxCouponOfDb.getId(),wxCouponOfDb.getTenantId(), merchantLnventory); } @Override @@ -210,7 +210,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { } //退回coupon库存 if(merchantRemain!=0) { - wxCouponService.backRemainInventory(queryById.getId(), merchantRemain, wxCouponOfDb.getRemainInventory()); + wxCouponService.backRemainInventory(queryById.getId(),wxCouponOfDb.getTenantId(), 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 142b10b91..dae785bb2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -178,19 +178,18 @@ public class WxCouponServiceImpl implements WxCouponService { } @Override - public WxCoupon getById(Long id) { - // TODO 富文本优化 - return wxCouponMapper.selectById(id); + public WxCoupon getById(Long id,String tenantId) { + return wxCouponMapper.selectById(id,tenantId); } @Override - public WxCoupon getHtmlById(Long id) { - return wxCouponMapper.selectById(id); + public WxCoupon getHtmlById(Long id,String tenantId) { + return wxCouponMapper.selectById(id,tenantId); } @Override - public WxCouponCVo getVoById(Long id) { - WxCouponCVo wxCouponCVo = wxCouponMapper.findVoDetail(id); + public WxCouponCVo getVoById(Long id,String tenantId) { + WxCouponCVo wxCouponCVo = wxCouponMapper.findVoDetail(id,tenantId); List merchantList = wxCouponCVo.getMerchantVoList(); if (merchantList != null) { merchantList = merchantList.stream().filter( @@ -202,8 +201,8 @@ public class WxCouponServiceImpl implements WxCouponService { } @Override - public WxCouponCVo getVoStatusById(Long id) { - WxCouponCVo wxCouponCVo = wxCouponMapper.findVoStatusDetail(id); + public WxCouponCVo getVoStatusById(Long id,String tenantId) { + WxCouponCVo wxCouponCVo = wxCouponMapper.findVoStatusDetail(id,tenantId); return wxCouponCVo; } @@ -493,8 +492,8 @@ public class WxCouponServiceImpl implements WxCouponService { } @Override - public void deleteById(Long id) { - wxCouponMapper.deleteById(id); + public void deleteById(Long id,String tenantId) { + wxCouponMapper.deleteById(id,tenantId); } @Override @@ -733,8 +732,8 @@ public class WxCouponServiceImpl implements WxCouponService { @Override @Transactional(isolation= Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) - public void reduceRemainInventory(Long id, Integer number) { - int num = wxCouponMapper.reduceInventory(id, number); + public void reduceRemainInventory(Long id,String tenantId, Integer number) { + int num = wxCouponMapper.reduceInventory(id,tenantId, number); if (num == 0) { throw new MallinkException(ErrorCode.ORDER_SAVE_ERR); } @@ -742,8 +741,8 @@ public class WxCouponServiceImpl implements WxCouponService { @Override @Transactional(isolation= Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) - public void backRemainInventory(Long id, Integer number, Integer remainInventory) { - int num = wxCouponMapper.backInventory(id, number, remainInventory); + public void backRemainInventory(Long id,String tenantId, Integer number, Integer remainInventory) { + int num = wxCouponMapper.backInventory(id,tenantId, number, remainInventory); if (num == 0) { throw new MallinkException(ErrorCode.REMAIN_BACK_FAIL); } @@ -751,8 +750,8 @@ public class WxCouponServiceImpl implements WxCouponService { @Override @Transactional(isolation= Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) - public ResultData cardDefer(Long id,Date validEndDate) { - WxCoupon coupon = wxCouponMapper.selectById(id); + public ResultData cardDefer(Long id,String tenantId,Date validEndDate) { + WxCoupon coupon = wxCouponMapper.selectById(id,tenantId); if (null == coupon) { return new ResultData(Result.ERROR,id+"未查询到券信息."); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java index fd7774e32..fce60ff70 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxGameServiceImpl.java @@ -294,7 +294,7 @@ public class WxGameServiceImpl implements WxGameService { public void saveOrUpdateCouponChannel(Long couponId, Map wxCouponChannelsMap, WxGame record){ - WxCoupon wxCoupon = wxCouponService.getById(couponId); + WxCoupon wxCoupon = wxCouponService.getById(couponId,record.getTenantId()); if (wxCoupon == null) { throw new MallinkException(ErrorCode.COUPON_IS_EMPTY); } 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 407b36d46..c866f8185 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -56,7 +56,6 @@ import com.iformall.domain.po.WxPayAccount; import com.iformall.domain.po.WxPayOrder; import com.iformall.domain.po.base.TenantEntity; import com.iformall.domain.po.msg.FmInsideOrderSuccessMsg; -import com.iformall.domain.po.msg.UpdateCouponStockMsg; import com.iformall.domain.vo.WxCouponSendVo; import com.iformall.domain.vo.WxMerchantVo; import com.iformall.domain.vo.WxOrderCouponPressVo; @@ -660,7 +659,7 @@ public class WxOrderServiceImpl implements WxOrderService { try { //减库存,从redis中取,然后发mq消息同步到数据库 - wxCouponService.reduceRemainInventory(coupon.getId(), 1); + wxCouponService.reduceRemainInventory(coupon.getId(),coupon.getTenantId(), 1); long stock = redisLock.decrease(EnumCacheKey.COUPON_STOCK.getMessage()+coupon.getId(), 1); if (stock < 0 ) { @@ -797,7 +796,7 @@ public class WxOrderServiceImpl implements WxOrderService { } try { - int num = wxCouponMapper.backInventory(coupon.getId(), 1, coupon.getRemainInventory()); + int num = wxCouponMapper.backInventory(coupon.getId(),coupon.getTenantId(), 1, coupon.getRemainInventory()); if (num <= 0) { logger.error("此券加库存失败, couponId: " + couponIdStr); throw new MallinkException(ErrorCode.ORDER_IS_FAIL.getCode(),"券couponId:["+couponIdStr+"]库存回滚失败,更新记录条数小于等于0."); diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderSuccessMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderSuccessMsgServiceImpl.java index fcc0c5057..99ca9412e 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderSuccessMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/FmInsideOrderSuccessMsgServiceImpl.java @@ -68,7 +68,7 @@ public class FmInsideOrderSuccessMsgServiceImpl implements MsgSendService { logger.error("用户未找到: " + msg.getCUserId()); throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "用户未找到" + msg.getCUserId()); } - WxCoupon coupon = couponService.getById(msg.getCouponId()); + WxCoupon coupon = couponService.getById(msg.getCouponId(),couponChannel.getTenantId()); if(coupon == null) { logger.error("券未找到" + msg.getCouponId()); throw new MallinkException(ErrorCode.COUPON_ORDER_IS_NULL.getCode(), "券未找到" + msg.getCouponId()); diff --git a/mallinkService/src/main/java/com/iformall/service/msg/impl/UpdateCouponStockMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/msg/impl/UpdateCouponStockMsgServiceImpl.java index fe46cf65c..5714748c3 100644 --- a/mallinkService/src/main/java/com/iformall/service/msg/impl/UpdateCouponStockMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/msg/impl/UpdateCouponStockMsgServiceImpl.java @@ -6,7 +6,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.iformall.domain.po.msg.BaseMsg; -import com.iformall.domain.po.msg.UpdateCouponStockMsg; import com.iformall.enums.EnumPayWay; import com.iformall.service.WxCouponService; import com.iformall.service.msg.MsgSendService; @@ -25,11 +24,11 @@ public class UpdateCouponStockMsgServiceImpl implements MsgSendService { @Override public void send(BaseMsg baseMsg) throws Exception { - UpdateCouponStockMsg msg = (UpdateCouponStockMsg)baseMsg; - if (null != msg ) { - if (msg.getOperateType().equals(UpdateCouponStockMsg.OPERATE_TYPE_DECREASE)) { - wxCouponService.reduceRemainInventory(msg.getCouponId(), (int)msg.getNumber()); - } - } +// UpdateCouponStockMsg msg = (UpdateCouponStockMsg)baseMsg; +// if (null != msg ) { +// if (msg.getOperateType().equals(UpdateCouponStockMsg.OPERATE_TYPE_DECREASE)) { +// wxCouponService.reduceRemainInventory(msg.getCouponId(), (int)msg.getNumber()); +// } +// } } } diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index 0af596860..269728cad 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -292,6 +292,15 @@ order by ${sortColumns} + + + + + update wx_coupon set is_del = 1 where id = #{id} and tenant_id = #{tenantId} + + + - select id, remain_inventory, status from wx_coupon - where id = #{id} + where id = #{id} and tenant_id =#{tenantId} - update wx_coupon SET remain_inventory = remain_inventory - #{number} where id = #{id} and remain_inventory - #{number} >= 0 + update wx_coupon SET remain_inventory = remain_inventory - #{number} where id = #{id} and tenant_id =#{tenantId} and remain_inventory - #{number} >= 0 - update wx_coupon SET remain_inventory = remain_inventory + #{number} where id = #{id} and remain_inventory + #{number} <= inventory + update wx_coupon SET remain_inventory = remain_inventory + #{number} where id = #{id} and tenant_id =#{tenantId} and remain_inventory + #{number} <= inventory