浏览代码

蛋糕券记录

fanzherong_v 2 月之前
父节点
当前提交
97f74a8346

+ 7 - 0
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/couponrecord/controller/BizCouponRecordController.java

@@ -62,6 +62,13 @@ public class BizCouponRecordController {
         return CommonResult.data(bizCouponRecordService.page(bizCouponRecordPageParam));
         return CommonResult.data(bizCouponRecordService.page(bizCouponRecordPageParam));
     }
     }
 
 
+    @Operation(summary = "小程序获取优惠券记录分页")
+    @SaCheckPermission("/biz/couponrecord/userPage")
+    @GetMapping("/biz/couponrecord/userPage")
+    public CommonResult<Page<BizCouponRecord>> userPage(BizCouponRecordPageParam bizCouponRecordPageParam) {
+        return CommonResult.data(bizCouponRecordService.userPage(bizCouponRecordPageParam));
+    }
+
     /**
     /**
      * 添加优惠券记录
      * 添加优惠券记录
      *
      *

+ 2 - 0
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/couponrecord/service/BizCouponRecordService.java

@@ -38,6 +38,8 @@ public interface BizCouponRecordService extends IService<BizCouponRecord> {
      */
      */
     Page<BizCouponRecord> page(BizCouponRecordPageParam bizCouponRecordPageParam);
     Page<BizCouponRecord> page(BizCouponRecordPageParam bizCouponRecordPageParam);
 
 
+    Page<BizCouponRecord> userPage(BizCouponRecordPageParam bizCouponRecordPageParam);
+
     /**
     /**
      * 添加优惠券记录
      * 添加优惠券记录
      *
      *

+ 31 - 0
snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/couponrecord/service/impl/BizCouponRecordServiceImpl.java

@@ -73,6 +73,7 @@ public class BizCouponRecordServiceImpl extends ServiceImpl<BizCouponRecordMappe
         if (ObjectUtil.isEmpty(loginUserDataScope)) {
         if (ObjectUtil.isEmpty(loginUserDataScope)) {
             queryWrapper.in("brr.user_id", StpLoginUserUtil.getLoginUser().getId());
             queryWrapper.in("brr.user_id", StpLoginUserUtil.getLoginUser().getId());
         }
         }
+        queryWrapper.eq("bcr.delete_flag","NOT_DELETE");
         queryWrapper.orderByDesc("bcr.create_time");
         queryWrapper.orderByDesc("bcr.create_time");
         Page<BizCouponRecord> pageList = this.getBaseMapper().getPageList(CommonPageRequest.defaultPage(), queryWrapper);
         Page<BizCouponRecord> pageList = this.getBaseMapper().getPageList(CommonPageRequest.defaultPage(), queryWrapper);
         for(BizCouponRecord bizCouponRecord : pageList.getRecords()){
         for(BizCouponRecord bizCouponRecord : pageList.getRecords()){
@@ -84,6 +85,35 @@ public class BizCouponRecordServiceImpl extends ServiceImpl<BizCouponRecordMappe
         return pageList;
         return pageList;
     }
     }
 
 
+    @Override
+    public Page<BizCouponRecord> userPage(BizCouponRecordPageParam bizCouponRecordPageParam) {
+        QueryWrapper<BizCouponRecord> queryWrapper = new QueryWrapper<BizCouponRecord>().checkSqlInjection();
+        if(ObjectUtil.isNotEmpty(bizCouponRecordPageParam.getCouponNo())) {
+            queryWrapper.like("bcr.coupon_no", bizCouponRecordPageParam.getCouponNo());
+        }
+        if(ObjectUtil.isNotEmpty(bizCouponRecordPageParam.getCouponStatus())) {
+            queryWrapper.eq("bcr.coupon_status", bizCouponRecordPageParam.getCouponStatus());
+        }
+        if(ObjectUtil.isNotEmpty(bizCouponRecordPageParam.getBeginTime()) && ObjectUtil.isNotEmpty(bizCouponRecordPageParam.getEndTime())){
+            queryWrapper.between("bcr.time",bizCouponRecordPageParam.getBeginTime()+" 00:00:00",bizCouponRecordPageParam.getEndTime()+" 23:59:59");
+        }
+        if(ObjectUtil.isNotEmpty(bizCouponRecordPageParam.getOrgId())){
+            queryWrapper.eq("bcr.org_id",bizCouponRecordPageParam.getOrgId());
+        }
+        queryWrapper.in("brr.user_id", StpLoginUserUtil.getLoginUser().getId());
+        queryWrapper.eq("bcr.delete_flag","NOT_DELETE");
+        queryWrapper.orderByDesc("bcr.create_time");
+        Page<BizCouponRecord> pageList = this.getBaseMapper().getPageList(CommonPageRequest.defaultPage(), queryWrapper);
+        for(BizCouponRecord bizCouponRecord : pageList.getRecords()){
+            if(ObjectUtil.isNotEmpty(bizCouponRecord.getPhone())){
+                //电话号码解密
+                bizCouponRecord.setPhone(CommonCryptogramUtil.doSm4CbcDecrypt(bizCouponRecord.getPhone()));
+            }
+        }
+        return pageList;
+    }
+
+
     @Transactional(rollbackFor = Exception.class)
     @Transactional(rollbackFor = Exception.class)
     @Override
     @Override
     public void add(BizCouponRecordAddParam bizCouponRecordAddParam) {
     public void add(BizCouponRecordAddParam bizCouponRecordAddParam) {
@@ -137,6 +167,7 @@ public class BizCouponRecordServiceImpl extends ServiceImpl<BizCouponRecordMappe
     public BizCouponRecord getCouponNoList(BizCouponRecordPageParam bizCouponRecordPageParam) {
     public BizCouponRecord getCouponNoList(BizCouponRecordPageParam bizCouponRecordPageParam) {
         QueryWrapper<BizCouponRecord> queryWrapper = new QueryWrapper<>();
         QueryWrapper<BizCouponRecord> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("brr.user_id",bizCouponRecordPageParam.getUserId());
         queryWrapper.eq("brr.user_id",bizCouponRecordPageParam.getUserId());
+        queryWrapper.eq("bcr.delete_flag","NOT_DELETE");
         queryWrapper.groupBy("brr.user_id");
         queryWrapper.groupBy("brr.user_id");
         BizCouponRecord couponNoList = this.getBaseMapper().getCouponNoList(queryWrapper);
         BizCouponRecord couponNoList = this.getBaseMapper().getCouponNoList(queryWrapper);
         return couponNoList;
         return couponNoList;