bugfix

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

@@ -90,7 +90,7 @@ public class CouponApi {
     @GetMapping("/center/list")
     public ResponseJson<PageInfo<CouponVo>> couponCenter(Integer userId, @RequestParam(value = "pageNum", defaultValue = "1") int pageNum,
                                                               @RequestParam(value = "pageSize", defaultValue = "10") int pageSize) {
-        return couponService.collarCouponsList(userId, pageNum, pageSize);
+        return couponService.collarCenterList(userId, pageNum, pageSize);
     }
 
     @ApiOperation("领取优惠券")

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

@@ -113,4 +113,6 @@ public interface CouponMapper {
     List<CouponVo> findMoneyCoupons();
 
     CouponVo findCouponDetail(Integer couponId);
+
+    Integer findUserPermission(Integer userId);
 }

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

@@ -86,4 +86,6 @@ public interface CouponService {
     ResponseJson<PageInfo<CouponVo>> findMoneyCoupons(int pageNum, int pageSize);
 
     ResponseJson<CouponVo> findCouponDetail(Integer couponId);
+
+    ResponseJson<PageInfo<CouponVo>> collarCenterList(Integer userId, int pageNum, int pageSize);
 }

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

@@ -270,6 +270,21 @@ public class CouponServiceImpl implements CouponService {
         return ResponseJson.success(couponVo);
     }
 
+    @Override
+    public ResponseJson<PageInfo<CouponVo>> collarCenterList(Integer userId, int pageNum, int pageSize) {
+        Date registerTime = couponMapper.findUserRegisterTime(userId);
+        Integer permission=couponMapper.findUserPermission(userId);
+        //如果是协销，userid置为0查所有
+        if(4==permission){
+            userId = 0;
+        }
+        PageHelper.startPage(pageNum, pageSize);
+        List<CouponVo> couponList = couponMapper.findCouponList(userId, registerTime);
+        couponList.forEach(this::setShopName);
+        PageInfo<CouponVo> pageInfo = new PageInfo<>(couponList);
+        return ResponseJson.success(pageInfo);
+    }
+
     /**
      * 过滤与商品无关的优惠券
      *

src/main/resources/mapper/CouponMapper.xml

@@ -133,7 +133,7 @@
             startDate,
             endDate,
         </if>
-        <if test="userId >0">
+        <if test="userId != null and userId > 0">
             if(#{registerTime} <![CDATA[ > ]]> startDate and #{registerTime} <![CDATA[ < ]]> endDate,#{registerTime},startDate) as startDate,
             if(receiveFlag=1,endDate,date_add(if(#{registerTime} <![CDATA[ > ]]> startDate and #{registerTime} <![CDATA[ < ]]> endDate,#{registerTime},startDate),interval receivePeriod day)) as endDate,
         </if>
@@ -156,7 +156,7 @@
             AND NOW() <![CDATA[ > ]]> startDate
             AND NOW() <![CDATA[ < ]]> if(receiveFlag = 1,endDate,date_add(startDate,interval receivePeriod day))
         </if>
-        <if test="userId > 0">
+        <if test="userId != null and userId > 0">
             AND id NOT IN(SELECT couponId FROM cm_coupon_club WHERE userId = #{userId})
             AND (couponType IN (0,1,3)
             OR (couponType = 2 AND userId = #{userId})
@@ -306,4 +306,7 @@
         LEFT JOIN shop s ON cc.shopId = s.shopId
         where id = #{couponId}
     </select>
+    <select id="findUserPermission" resultType="java.lang.Integer">
+        select userPermission from user where userID = #{userId}
+    </select>
 </mapper>