From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WxShopCouponService.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WxShopCouponService.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WxShopCouponService.java
index b406cb6..fd92862 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WxShopCouponService.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/service/WxShopCouponService.java
@@ -2,9 +2,9 @@
import com.matrix.core.pojo.AjaxResult;
import com.matrix.core.pojo.PaginationVO;
-import com.matrix.system.shopXcx.bean.ShopCoupon;
-import com.matrix.system.shopXcx.bean.ShopShoppingCart;
+import com.matrix.system.shopXcx.api.pojo.OrderItemDto;
import com.matrix.system.shopXcx.api.vo.CouponReceiveInfoVO;
+import com.matrix.system.shopXcx.bean.ShopCoupon;
import java.util.List;
@@ -18,7 +18,7 @@
* 根据购物车选中的产品
* @return
*/
- public List<CouponReceiveInfoVO> getCartVoCouponList(Long shopId,List<ShopShoppingCart> shopShoppingCarts);
+ public List<CouponReceiveInfoVO> getCartVoCouponList(Long companyId,List<OrderItemDto> OrderItemDtos);
/**
@@ -42,12 +42,12 @@
* 根据状态获取我的优惠券
*
*
- * @param shopId
+ * @param companyId
* @param status
* @param pageVo
* @return
*/
- AjaxResult getMyCouponInfoByStatus(Long shopId, Integer status, PaginationVO pageVo);
+ AjaxResult getMyCouponInfoByStatus(Long companyId, Integer status, PaginationVO pageVo);
/**
* 根据产品ID获取优惠券列表
@@ -62,10 +62,10 @@
* 根据标签获取优惠券列表
*
* @param tag
- * @param shopId
+ * @param companyId
* @return
*/
- AjaxResult getCouponListByTag(String tag, Long shopId);
+ AjaxResult getCouponListByTag(String tag, Long companyId);
/**
* 根据产品id查询该产品符合的优惠活动
--
Gitblit v1.9.1