學習獲得積分

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

@@ -11,4 +11,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface ActivityTaskMapper extends BaseMapper<ActivityTask> {
 
+    /**
+     * 查询类型活动
+     *
+     * @param taskId 类型id
+     *
+     */
+    ActivityTask queryByTaskId(Long taskId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/IActivityTaskService.java

@@ -49,4 +49,12 @@ public interface IActivityTaskService extends IService<ActivityTask> {
 	 * @return
 	 */
 	Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+
+	/**
+	 * 查询当前做的任务类型
+	 * @param taskId 主键集合
+	 * @return
+	 */
+    ActivityTaskVo queryByTaskId(Long taskId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityTaskServiceImpl.java

@@ -159,4 +159,10 @@ public class ActivityTaskServiceImpl extends ServiceImpl<ActivityTaskMapper, Act
         }
         return this.removeByIds(ids);
     }
+
+    @Override
+    public ActivityTaskVo queryByTaskId(Long taskId) {
+        ActivityTask db = baseMapper.queryByTaskId(taskId);
+        return BeanUtil.toBean(db,ActivityTaskVo.class);
+    }
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/activity/service/impl/ActivityTaskUserServiceImpl.java

@@ -317,22 +317,34 @@ public class ActivityTaskUserServiceImpl extends ServiceImpl<ActivityTaskUserMap
             return 0;
         }
 
-        ActivityTaskVo activityTaskVo = activityTaskService.queryById(bo.getTaskId());
+        ActivityTaskVo activityTaskVo = activityTaskService.queryByTaskId(Convert.toLong(bo.getTaskType()));
 
         //增加用户积分
         if ((activityTaskVo.getLongTime()*60) > Convert.toInt(bo.getScore())) {
             return 0;
         }
-        Integer integer = (int)Math.ceil((Convert.toInt(bo.getScore())/activityTaskVo.getLongTime()*60));
+        Integer integer = (int)Math.ceil(Convert.toInt(bo.getScore())/(activityTaskVo.getLongTime()*60));
 
             UserVo userVo = userService.queryById(bo.getUserId());
-            ActivityGradeVo list1 = activityGradeService.queryByInteger(userVo.getIntegral() + (activityTaskVo.getStartIntegral()*integer));
+            Long socor = 0L;
+            if (userVo.getIntegral() != null) {
+                socor = userVo.getIntegral() + (activityTaskVo.getStartIntegral() * integer);
+            }else {
+                socor =  Convert.toLong(activityTaskVo.getStartIntegral() * integer);
+
+            }
+        ActivityGradeVo list1 = activityGradeService.queryByInteger(socor);
             userVo.setUserLevel(list1.getGrade());
-            increaseUser(userVo, userVo.getIntegral() + activityTaskVo.getStartIntegral());
+            increaseUser(userVo, socor);
 
         //增加领取记录
         ActivityTaskUser add = BeanUtil.toBean(bo, ActivityTaskUser.class);
         add.setScore(Convert.toStr(activityTaskVo.getStartIntegral()));
+        add.setCreateTime(DateUtils.getNowTime());
+        add.setUpdateTime(DateUtils.getNowTime());
+        add.setTaskType(bo.getTaskType());
+        add.setUserId(bo.getUserId());
+        add.setTaskId(activityTaskVo.getId());
         this.save(add);
         return (activityTaskVo.getStartIntegral()*integer);
     }

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

@@ -0,0 +1,33 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 活动订单添加对象 order_activity
+ *
+ * @author ruoyi
+ * @date 2021-07-01
+ */
+@Data
+@ApiModel("活动订单添加对象")
+public class OrderActivityAddBo {
+
+    /** 订单号 */
+    @ApiModelProperty("订单号")
+    private Long orderId;
+    /** 活动ID */
+    @ApiModelProperty("活动ID")
+    private Long activityId;
+    /** 创建时间 */
+    @ApiModelProperty("创建时间")
+    private Long createTime;
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+}

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

@@ -0,0 +1,36 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+
+/**
+ * 活动订单编辑对象 order_activity
+ *
+ * @author ruoyi
+ * @date 2021-07-01
+ */
+@Data
+@ApiModel("活动订单编辑对象")
+public class OrderActivityEditBo {
+
+
+    /** $column.columnComment */
+    @ApiModelProperty("$column.columnComment")
+    private Long id;
+
+    /** 订单号 */
+    @ApiModelProperty("订单号")
+    private Long orderId;
+
+    /** 活动ID */
+    @ApiModelProperty("活动ID")
+    private Long activityId;
+
+    /** 修改时间 */
+    @ApiModelProperty("修改时间")
+    private Long updateTime;
+}

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

@@ -0,0 +1,46 @@
+package com.zhongzheng.modules.order.bo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.HashMap;
+
+import com.zhongzheng.common.core.domain.BaseEntity;
+
+/**
+ * 活动订单分页查询对象 order_activity
+ *
+ * @author ruoyi
+ * @date 2021-07-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel("活动订单分页查询对象")
+public class OrderActivityQueryBo extends BaseEntity {
+
+	/** 分页大小 */
+	@ApiModelProperty("分页大小")
+	private Integer pageSize;
+	/** 当前页数 */
+	@ApiModelProperty("当前页数")
+	private Integer pageNum;
+	/** 排序列 */
+	@ApiModelProperty("排序列")
+	private String orderByColumn;
+	/** 排序的方向desc或者asc */
+	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
+	private String isAsc;
+
+
+	/** 订单号 */
+	@ApiModelProperty("订单号")
+	private Long orderId;
+	/** 活动ID */
+	@ApiModelProperty("活动ID")
+	private Long activityId;
+
+}

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

@@ -23,6 +23,11 @@ public class OrderAddBo {
     /** 优惠券ID */
     @ApiModelProperty("优惠券ID")
     private Long couponId;
+
+    /** 活動ID */
+    @ApiModelProperty("活動ID")
+    private Long activityId;
+
     /** 订单价格 */
     @ApiModelProperty("商品列表")
     private List<OrderGoodsAddBo> goodsList;

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityConfigurationMapper.xml

@@ -240,6 +240,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN course s ON f.course_id = s.course_id
         WHERE 1=1
         and c.status = 3
+          and c.activity_type in (3,4,5)
         <if test="courseId != null" >
             and f.course_id = #{courseId}
         </if>

zhongzheng-system/src/main/resources/mapper/modules/activity/ActivityTaskMapper.xml

@@ -19,5 +19,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status" column="status"/>
     </resultMap>
 
+    <select id="queryByTaskId" parameterType="Long" resultMap="ActivityTaskResult">
+        select * FROM activity_task where 1=1
+            and task_type = #{taskId} limit 1
+
+    </select>
 
 </mapper>