人脸核身

zhongzheng-admin/src/main/java/com/zhongzheng/controller/activity/ActivityTaskController.java

@@ -46,7 +46,7 @@ public class ActivityTaskController extends BaseController {
      * 查询任务存储列表
      */
     @ApiOperation("查询任务存储列表")
-    @PreAuthorize("@ss.hasPermi('modules.activity:task:list')")
+    @PreAuthorize("@ss.hasPermi('activity:task:list')")
     @GetMapping("/list")
     public TableDataInfo<ActivityTaskVo> list(ActivityTaskQueryBo bo) {
         startPage();

zhongzheng-admin/src/main/java/com/zhongzheng/controller/polyv/PolyvVideoController.java

@@ -20,7 +20,7 @@ import io.swagger.annotations.ApiOperation;
 /**
  * 保利威视频信息Controller
  *
- * @author ruoyi
+ * @author zhongzheng
  * @date 2021-06-11
  */
 @Api(value = "保利威视频信息控制器", tags = {"保利威视频信息管理"})

zhongzheng-api/src/main/java/com/zhongzheng/controller/activity/ActivityConfigurationController.java

@@ -12,7 +12,11 @@ import com.zhongzheng.modules.activity.bo.ActivityConfigurationUseAddBo;
 import com.zhongzheng.modules.activity.service.IActivityConfigurationService;
 import com.zhongzheng.modules.activity.service.IActivityConfigurationUseService;
 import com.zhongzheng.modules.activity.vo.ActivityConfigurationVo;
+import com.zhongzheng.modules.course.service.ICourseService;
 import com.zhongzheng.modules.course.vo.CourseConfigurationVo;
+import com.zhongzheng.modules.order.bo.CouponQueryBo;
+import com.zhongzheng.modules.order.service.ICouponService;
+import com.zhongzheng.modules.order.vo.CouponVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -39,6 +43,8 @@ public class ActivityConfigurationController extends BaseController {
 
     private final IActivityConfigurationUseService activityConfigurationUseServiceImpl;
 
+    private final ICouponService couponService;
+
     /**
      * 查询活动配置列表
      */
@@ -61,4 +67,16 @@ public class ActivityConfigurationController extends BaseController {
     }
 
 
+    /**
+     * 查詢擁有券
+     */
+    @ApiOperation("查詢用户擁有券")
+    @GetMapping("/listCoupon")
+    public TableDataInfo<CouponVo> listCoupon(CouponQueryBo bo) {
+        startPage();
+        List<CouponVo> list = couponService.queryIssueListCoupon(bo);
+        return getDataTable(list);
+    }
+
+
 }

zhongzheng-api/src/main/resources/application-dev.yml

@@ -82,7 +82,7 @@ aliyun:
         endpoint: https://file-dev.xyyxt.net # oss对外服务的访问域名
         accessKeyId: LTAIgC8O2WUXvXuR  # 访问身份验证中用到用户标识
         accessKeySecret: 1yyCazuT1M6MruBXzgFjP0p9gdMlwX # 用户用于加密签名字符串和oss用来验证签名字符串的密钥
-        bucketName: testzhongzheng # oss的存储空间
+        bucketName: zhongzheng-test # oss的存储空间
         policy:
             expire: 30 # 签名有效期(S)
         maxSize: 10 # 上传文件大小(M)

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/mapper/ActivityConfigurationMapper.java

@@ -32,5 +32,12 @@ public interface ActivityConfigurationMapper extends BaseMapper<ActivityConfigur
      */
     ActivityConfigurationVo selectConfigures(Long id);
 
+
+    /**
+     * 查询用户能做的活动
+     *
+     * @param bo 详细配置信息
+     * @return Collection<CourseConfigurationVo> 详细配置
+     */
     Collection<CourseConfigurationVo> selectConfiguraIssueList(ActivityConfigurationQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/ICourseService.java

@@ -7,6 +7,8 @@ import com.zhongzheng.modules.course.bo.CourseEditBo;
 import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.course.domain.Course;
 import com.zhongzheng.modules.course.vo.CourseVo;
+import com.zhongzheng.modules.order.bo.CouponQueryBo;
+import com.zhongzheng.modules.order.vo.CouponVo;
 
 import java.util.Collection;
 import java.util.List;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -11,6 +11,8 @@ import com.zhongzheng.modules.course.domain.Course;
 import com.zhongzheng.modules.course.mapper.CourseMapper;
 import com.zhongzheng.modules.course.service.ICourseService;
 import com.zhongzheng.modules.course.vo.CourseVo;
+import com.zhongzheng.modules.order.bo.CouponQueryBo;
+import com.zhongzheng.modules.order.vo.CouponVo;
 import com.zhongzheng.modules.system.domain.SysUserRole;
 import com.zhongzheng.modules.system.mapper.SysRoleMapper;
 import org.springframework.beans.factory.annotation.Autowired;

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/CouponQueryBo.java

@@ -47,7 +47,7 @@ public class CouponQueryBo extends BaseEntity {
 	@ApiModelProperty("券拥有者")
 	private Long userId;
 	/** 0 未使用 1已使用 */
-	@ApiModelProperty("0 未使用 1已使用")
+	@ApiModelProperty("0 未使用 1已使用 2已失效")
 	private Integer userStatus;
 
 	/** 所属活动 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/ICouponService.java

@@ -49,4 +49,11 @@ public interface ICouponService extends IService<Coupon> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+	/**
+	 * 查詢卡券
+	 * @param bo 主键集合
+	 * @return List<CouponVo>
+	 */
+	List<CouponVo> queryIssueListCoupon(CouponQueryBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/CouponServiceImpl.java

@@ -101,4 +101,16 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public List<CouponVo> queryIssueListCoupon(CouponQueryBo bo) {
+        LambdaQueryWrapper<Coupon> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getPrice() != null, Coupon::getPrice, bo.getPrice());
+        lqw.eq(bo.getEndTime() != null, Coupon::getEndTime, bo.getEndTime());
+        lqw.eq(bo.getUserId() != null, Coupon::getUserId, bo.getUserId());
+        lqw.eq(bo.getUserStatus() != null, Coupon::getUserStatus, bo.getUserStatus());
+        lqw.eq(bo.getConfigurationId() != null, Coupon::getConfigurationId, bo.getConfigurationId());
+        lqw.eq(bo.getCouponType() != null, Coupon::getCouponType, bo.getCouponType());
+        return entity2Vo(this.list(lqw));
+    }
 }