Merge branch 'developer'

935090232@qq.com

2022-02-22 bbe0a2fd03063316e50cf141986bda984599bbda

 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.system.common.init.UserCacheManager;
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.*;
@@ -25,7 +25,7 @@
    @Autowired
    private ShopCouponDao shopCouponDao;
    @Autowired
    private RedisUserLoginUtils redisUserLoginUtils;
    private UserCacheManager userCacheManager;

    /**
     * 获取可以领取的优惠券
@@ -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());
    }

}