14

bhkj-delivery-module-backstage/src/main/java/com/bohuikeji/delivery/backstage/controller/api/customer/VoucherV2Api.java

@@ -61,14 +61,14 @@ public class VoucherV2Api extends ApiController {
     @GetMapping("/customer/order/get")
     public APIEntity customerByOrderReceive(@RequestAttribute("JwtUserId") Integer id){
         List<TDiscountRecord> receiveRecords = new ArrayList<>(0);//receiveRecordService.list(new QueryWrapper<TDiscountRecord>().eq("customer_id",id).in("usage_status","未使用","使用中"));
-        /*if(receiveRecords.size()<1){
+        if(receiveRecords.size()<1){
             return APIEntity.success(receiveRecords);
         }
         for(TDiscountRecord receiveRecord : receiveRecords){
             if(LocalDate.now().isAfter(receiveRecord.getEndDate())){
                 receiveRecordService.updateById(receiveRecord.setUsageStatus("已过期"));
             }
-        }*/
+        }
         return APIEntity.success(receiveRecords);
     }
 
@@ -86,7 +86,7 @@ public class VoucherV2Api extends ApiController {
         if (StringUtils.isBlank(usageStatus)){
             return APIEntity.fail("查询参数为空！");
         }
-        /*List<TDiscountRecord> receiveRecords = receiveRecordService.list(new QueryWrapper<TDiscountRecord>().eq("customer_id",id));
+        List<TDiscountRecord> receiveRecords = receiveRecordService.list(new QueryWrapper<TDiscountRecord>().eq("customer_id",id));
         for(TDiscountRecord receiveRecord : receiveRecords){
             if(LocalDate.now().isAfter(receiveRecord.getEndDate())){
                 receiveRecordService.updateById(receiveRecord.setUsageStatus("已过期"));
@@ -102,9 +102,9 @@ public class VoucherV2Api extends ApiController {
                 return APIEntity.fail("无法识别参数usageStatus");
         }
         page = (DataPage) receiveRecordService.page(page,queryWrapper);
-        JSONArray tPatternCour = new JSONArray();
-        List<TDiscountRecord> tReceiveRecords = page.getRecords();*/
-        /*for(TDiscountRecord receiveRecord :tReceiveRecords){
+        /*JSONArray tPatternCour = new JSONArray();
+        List<TDiscountRecord> tReceiveRecords = page.getRecords();
+        for(TDiscountRecord receiveRecord :tReceiveRecords){
             TPatternInfo tPatternInfo = patternInfoService.getById(receiveRecord.getPatternId());
             receiveRecord.setPatternInfo(tPatternInfo);
             tPatternCour.add(receiveRecord);
@@ -120,14 +120,14 @@ public class VoucherV2Api extends ApiController {
 
     @ApiOperation("判断优惠卷是否弹框")
     @GetMapping("/get/voucher/bullet/frame/list")
-    public APIEntity getVoucherBulletFrame(@RequestAttribute("JwtUserId") Integer id) throws IOException {
+    public APIEntity getVoucherBulletFrame(@RequestAttribute("JwtUserId") Integer id) throws Exception {
         TCustomer tCustomer = customerService.getById(id);
         List<TDiscountMall> discountMalls;
         byte[] b = new byte[1024];
         if(tCustomer == null){
             return APIEntity.fail("当前用户不存在，请重新登陆");
         }
-        /*List<Object> couponIds = receiveRecordService.listObjs(new QueryWrapper<TDiscountRecord>().select("dis_id").eq("customer_id",id));
+        List<Object> couponIds = receiveRecordService.listObjs(new QueryWrapper<TDiscountRecord>().select("dis_id").eq("customer_id",id));
         if(couponIds.size()<1){
             discountMalls = createVoucherService.list(new QueryWrapper<TDiscountMall>().eq("dis_state","发放中").eq("receive_method","客户领取").eq("dis_mode","弹框"));
         }else {
@@ -136,8 +136,8 @@ public class VoucherV2Api extends ApiController {
 
         if(discountMalls.size()<1){
             return APIEntity.success();
-        }*/
-        /*log.info("获取弹框优惠卷的数量：[{}]",discountMalls.size());
+        }
+        log.info("获取弹框优惠卷的数量：[{}]",discountMalls.size());
         for(TDiscountMall discountMall : discountMalls){
             List<TDiscountRecord>  receiveRecords = receiveRecordService.list(new QueryWrapper<TDiscountRecord>().eq("dis_id",discountMall.getDisId()).eq("customer_id",id));
             if(receiveRecords.size()>1){
@@ -145,7 +145,7 @@ public class VoucherV2Api extends ApiController {
             }
             if(tCustomer.getTemplateId() != null && "商户卷".equals(discountMall.getGrantType())){
                 log.info("进入商户卷弹框");
-                return APIEntity.success(discountConst.frameTemplate(discountMall));
+                return APIEntity.success(discountConst.frameTemplate(discountMall,null));
             }
             List<TOrder> orderList = orderService.list(new QueryWrapper<TOrder>().eq("order_status","已完成").eq("player_id",tCustomer.getCustomerId()));
             log.info("当前客户的id:{},下单数量:{}",tCustomer.getCustomerId(),orderList.size());
@@ -155,13 +155,13 @@ public class VoucherV2Api extends ApiController {
             }
             if(orderList.size()>1 && "老客户卷".equals(discountMall.getGrantType())){
                 log.info("进入老客户卷弹框");
-                return APIEntity.success(discountConst.frameTemplate(discountMall));
+                return APIEntity.success(discountConst.frameTemplate(discountMall,null));
             }
             if("全部".equals(discountMall.getGrantType()) && tCustomer.getTemplateId()==null){
                 log.info("进入全部卷弹框");
-                return APIEntity.success(discountConst.frameTemplate(discountMall));
+                return APIEntity.success(discountConst.frameTemplate(discountMall,null));
             }
-        }*/
+        }
         return APIEntity.success();
     }
 /**