bugfix

src/main/java/com/caimei365/commodity/controller/CouponApi.java

@@ -143,12 +143,15 @@ public class CouponApi {
     @ApiOperation("协销价值优惠券列表")
     @GetMapping("/money/coupon/list")
     @ApiImplicitParams({
+            @ApiImplicitParam(required = false, name = "userId", value = "指定购买优惠券机构userId"),
             @ApiImplicitParam(required = false, name = "pageNum", value = "页码"),
             @ApiImplicitParam(required = false, name = "pageSize", value = "每页数量")
     })
-    public ResponseJson<PageInfo<CouponVo>> moneyCouponList(@RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
+    public ResponseJson<PageInfo<CouponVo>> moneyCouponList(
+                                                        Integer userId,
+                                                        @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                         @RequestParam(value = "pageSize", defaultValue = "10") int pageSize){
-        return couponService.findMoneyCoupons(pageNum,pageSize);
+        return couponService.findMoneyCoupons(userId,pageNum,pageSize);
     }
 
     @ApiOperation("根据优惠券ID查优惠券信息")

src/main/java/com/caimei365/commodity/mapper/CouponMapper.java

@@ -110,7 +110,7 @@ public interface CouponMapper {
      */
     List<Integer> findVipCoupon();
 
-    List<CouponVo> findMoneyCoupons();
+    List<CouponVo> findMoneyCoupons(Integer userId);
 
     CouponVo findCouponDetail(Integer couponId);
 }

src/main/java/com/caimei365/commodity/service/CouponService.java

@@ -83,7 +83,7 @@ public interface CouponService {
      */
     ResponseJson<Map<String, Object>> detailsCoupons(Integer userId, Integer productId, Integer source, Integer status);
 
-    ResponseJson<PageInfo<CouponVo>> findMoneyCoupons(int pageNum, int pageSize);
+    ResponseJson<PageInfo<CouponVo>> findMoneyCoupons(Integer userId,int pageNum, int pageSize);
 
     ResponseJson<CouponVo> findCouponDetail(Integer couponId);
 }

src/main/java/com/caimei365/commodity/service/impl/CouponServiceImpl.java

@@ -262,9 +262,9 @@ public class CouponServiceImpl implements CouponService {
     }
 
     @Override
-    public ResponseJson<PageInfo<CouponVo>> findMoneyCoupons(int pageNum, int pageSize) {
+    public ResponseJson<PageInfo<CouponVo>> findMoneyCoupons(Integer userId,int pageNum, int pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<CouponVo> cop = couponMapper.findMoneyCoupons();
+        List<CouponVo> cop = couponMapper.findMoneyCoupons(userId);
         PageInfo<CouponVo> pageInfo = new PageInfo<>(cop);
         return ResponseJson.success(pageInfo);
     }

src/main/resources/mapper/CouponMapper.xml

@@ -276,8 +276,14 @@
         FROM
             cm_coupon cc
         LEFT JOIN shop s ON cc.shopId = s.shopId
+        <if test="userId != null and userId > 0">
+        left join cm_coupon_club ccc on ccc.couponId = cc.id
+        </if>
         WHERE
-              id>0
+             cc.id>0
+          <if test="userId != null and userId>0">
+            AND cc.id not in (select couponId from ccc where userId=#{userId})
+          </if>
           AND cc.delFlag = 0
           AND cc.moneyCouponFlag = 1
           AND cc.status != 2