From 62d2a24a0d2c5bca61f727ac3d9e6bd7ce162151 Mon Sep 17 00:00:00 2001 From: Helius <wangdoubleone@gmail.com> Date: Wed, 10 Mar 2021 15:30:29 +0800 Subject: [PATCH] modify --- zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopCouponAction.java | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopCouponAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopCouponAction.java index 25d3e4c..b57dc41 100644 --- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopCouponAction.java +++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShopCouponAction.java @@ -1,11 +1,11 @@ package com.matrix.system.shopXcx.api.action; +import com.matrix.component.redis.RedisUserLoginUtils; import com.matrix.core.pojo.AjaxResult; import com.matrix.core.pojo.PaginationVO; - -import com.matrix.component.redis.RedisUserLoginUtils; -import com.matrix.system.shopXcx.dao.ShopCouponDao; +import com.matrix.system.common.interceptor.HostInterceptor; import com.matrix.system.shopXcx.api.service.WxShopCouponService; +import com.matrix.system.shopXcx.dao.ShopCouponDao; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -58,11 +58,11 @@ * * @return */ - @RequestMapping(value = "getMyCouponInfoByStatus/{shopId}/{status}") + @RequestMapping(value = "getMyCouponInfoByStatus/{status}") @ResponseBody - public AjaxResult getMyCouponInfo(@PathVariable("shopId") Long shopId,@PathVariable("status") Integer status, @RequestBody PaginationVO pageVo) { + public AjaxResult getMyCouponInfo(@PathVariable("status") Integer status, @RequestBody PaginationVO pageVo) { - return shopCouponService.getMyCouponInfoByStatus(shopId,status, pageVo); + return shopCouponService.getMyCouponInfoByStatus(HostInterceptor.getCompanyId(),status, pageVo); } /** @@ -76,10 +76,10 @@ return new AjaxResult(AjaxResult.STATUS_SUCCESS, shopCouponService.getCouponListByProductId(productId)); } - @GetMapping(value = "getCouponListByTag/{shopId}/{tag}") + @GetMapping(value = "getCouponListByTag/{tag}") @ResponseBody - public AjaxResult getCouponListByTag(@PathVariable("tag") String tag,@PathVariable("shopId") Long shopId) { - return shopCouponService.getCouponListByTag(tag,shopId); + public AjaxResult getCouponListByTag(@PathVariable("tag") String tag) { + return shopCouponService.getCouponListByTag(tag, HostInterceptor.getCompanyId()); } } \ No newline at end of file -- Gitblit v1.9.1