卡券数量

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/marketing/MemberMarketingController.java

@@ -41,6 +41,7 @@ import com.gic.integralmall.api.dto.IntegralMallExchangeLogDTO;
 import com.gic.integralmall.api.service.IntegralmallService;
 import com.gic.marketing.api.dto.CoupCardShelfDTO;
 import com.gic.marketing.api.dto.MemberCardLogDTO;
+import com.gic.marketing.api.dto.WechatCard;
 import com.gic.marketing.api.dto.member.MemberSmsLogDTO;
 import com.gic.marketing.api.dto.member.MemberWechatLogDTO;
 import com.gic.marketing.api.service.CardExportService;
@@ -52,6 +53,7 @@ import com.gic.marketing.pro.api.dto.game.GameDTO;
 import com.gic.marketing.pro.api.service.ai.AiMemberLogApiService;
 import com.gic.marketing.pro.api.service.game.GameApiService;
 import com.gic.member.api.dto.AchievementSystemDTO;
+import com.gic.member.api.dto.MemberDTO;
 import com.gic.member.api.service.AchievementService;
 import com.google.common.collect.Lists;
 
@@ -259,6 +261,12 @@ public class MemberMarketingController extends WebBaseController {
     @RequestMapping("/member/marketing-count")
     @ResponseBody
     public RestResponse<Map<String,Integer>> marketingCount(String memberId, String enterpriseId) {
+        //1 待使用 2已使用 3已过期
+        Page<WechatCard> page = new Page<WechatCard>();
+        page.setPageSize(Integer.MAX_VALUE);
+        page.setCurrentPage(1);
+        page = this.cardExportService.getMemgerCouponByStatus(memberId, 1, page);
+        int memberCouponCount = page.getTotalCount();
         // 时间默认一个月
         Calendar start = Calendar.getInstance();
         Date endTime = start.getTime();
@@ -288,6 +296,7 @@ public class MemberMarketingController extends WebBaseController {
         map.put("coupon", cardPage.getTotalCount()) ;
         map.put("wechat", wechatPage.getTotalCount()) ;
         map.put("ai", aiMemberLogRes.getResult().getTotalCount()) ;
+        map.put("memberCouponCount", memberCouponCount) ;
         return RestResponse.successResult(map);
     }