拼团

src/main/java/com/huiju/estateagents/controller/TaShareActivityController.java

@@ -228,7 +228,7 @@ public class TaShareActivityController extends BaseController {
             taShareActivity.setStatus(1);
             //0：进行中 1：未开始 2：已结束
             taShareActivity.setActivityStatus(2);
-            taShareActivity.setGroupActicityId(id);
+            taShareActivity.setGroupActivityId(id);
             if (iTaShareActivityService.updateById(taShareActivity)){
                 responseBean.addSuccess(taShareActivity);
             }else {
@@ -259,7 +259,7 @@ public class TaShareActivityController extends BaseController {
         }
 
         QueryWrapper<TaNews> newsQueryWrapper = new QueryWrapper<>();
-        newsQueryWrapper.eq("group_acticity_id", taShareActivity.getGroupActicityId());
+        newsQueryWrapper.eq("group_acticity_id", taShareActivity.getGroupActivityId());
         if (iTaShareActivityService.updateById(taShareActivity)){
             responseBean.addSuccess("成功");
         }else {
@@ -290,7 +290,7 @@ public class TaShareActivityController extends BaseController {
             //查看此活动已经完成的数量
             QueryWrapper<TaShareRecord> shareRecordQueryWrapper = new QueryWrapper<>();
             shareRecordQueryWrapper.eq("org_id",orgId);
-            shareRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActicityId());
+            shareRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActivityId());
             shareRecordQueryWrapper.eq("status",CommConstant.STATUS_UNACCALIMED);
             List<TaShareRecord> taShareRecordsList = taShareRecordService.list(shareRecordQueryWrapper);
             taShareActivity.setSuccessNum(taShareRecordsList.size());
@@ -303,7 +303,7 @@ public class TaShareActivityController extends BaseController {
              }else {
                  QueryWrapper<TaShareRecord> recordQueryWrapper = new QueryWrapper<>();
                  recordQueryWrapper.eq("org_id",orgId);
-                 recordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActicityId());
+                 recordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActivityId());
                  recordQueryWrapper.eq("person_id",person.getPersonId());
                  taShareRecord = taShareRecordService.getOne(recordQueryWrapper);
              }
@@ -315,7 +315,7 @@ public class TaShareActivityController extends BaseController {
                 //团员
                 QueryWrapper<TaShareChildRecord> childRecordQueryWrapper = new QueryWrapper<>();
                 childRecordQueryWrapper.eq("org_id",orgId);
-                childRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActicityId());
+                childRecordQueryWrapper.eq("group_activity_id",taShareActivity.getGroupActivityId());
                 childRecordQueryWrapper.eq("record_id",taShareRecord.getRecordId());
                 List<TaShareChildRecord> shareChildRecordList = taShareChildRecordService.list(childRecordQueryWrapper);
                 map.put("shareChildRecordList",shareChildRecordList);

src/main/java/com/huiju/estateagents/controller/TdPosterTemplateController.java

@@ -12,6 +12,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * <p>
     *   前端控制器
@@ -21,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2019-10-23
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TdPosterTemplateController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TdPosterTemplateController.class);
@@ -140,4 +142,27 @@ public class TdPosterTemplateController extends BaseController {
         }
         return responseBean;
     }
+    
+    /**
+     * 根据type获取数据
+     * @param type
+     * @return
+     */
+    @RequestMapping(value="/admin/posterTemplate",method= RequestMethod.GET)
+    public ResponseBean posterTemplateList(@RequestParam(value ="type") String type){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            QueryWrapper<TdPosterTemplate> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("type",type);
+            queryWrapper.orderByDesc("create_date");
+            
+            List<TdPosterTemplate> result = iTdPosterTemplateService.list(queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("posterTemplateList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com/huiju/estateagents/entity/TaShareActivity.java

@@ -27,8 +27,8 @@ public class TaShareActivity implements Serializable {
     /**
      * 活动id
      */
-    @TableId(value = "group_acticity_id", type = IdType.AUTO)
-    private Integer groupActicityId;
+    @TableId(value = "group_activity_id", type = IdType.AUTO)
+    private Integer groupActivityId;
 
     /**
      * 项目id

src/main/java/com/huiju/estateagents/job/JudglActivityTimeJob.java

@@ -98,10 +98,10 @@ public class JudglActivityTimeJob extends BaseController {
             LocalDateTime startTime = taShareActivity.getStartTime();
             LocalDateTime endTime = taShareActivity.getEndTime();
             if (nowTime.isAfter(startTime) && endTime.isAfter(nowTime)){
-                startGroupActivityIds.add(taShareActivity.getGroupActicityId());
+                startGroupActivityIds.add(taShareActivity.getGroupActivityId());
             }
             if (nowTime.isAfter(endTime)){
-                endGroupActivityIds.add(taShareActivity.getGroupActicityId());
+                endGroupActivityIds.add(taShareActivity.getGroupActivityId());
             }
         }
         iTaShareActivityService.updateUnStartActivity(startGroupActivityIds);

src/main/java/com/huiju/estateagents/service/impl/TaShareRecordServiceImpl.java

@@ -191,6 +191,9 @@ public class TaShareRecordServiceImpl extends ServiceImpl<TaShareRecordMapper, T
         if (record != null){
             return ResponseBean.error("您已经发起拼团，请勿再次发起，加入好友的拼团吧",ResponseBean.ERROR_UNAVAILABLE);
         }
+        if (null == taShareActivity.getIntegral()){
+            taShareActivity.setIntegral(0);
+        }
         if (person.getPoints() == null || person.getPoints() < taShareActivity.getIntegral()){
             return ResponseBean.error("积分不足",ResponseBean.ERROR_UNAVAILABLE);
         }

src/main/resources/mapper/TaShareActivityMapper.xml

@@ -8,7 +8,6 @@
         t.activity_name,
         t.main_img,
         t.group_buy_people,
-        t.join_people,
         t.integral,
         t.share_id,
         t.poster_id,
@@ -16,11 +15,6 @@
         from ta_share_activity t where t.group_acticity_id = #{activityId}
     </select>
 
-    <update id="updateJoinPeople">
-        update ta_share_activity set join_people =  join_people + 1
-        where group_acticity_id = #{activityId}
-    </update>
-
     <update id="updateUnStartGroupActivity">
         update ta_share_activity t set t.activity_status = 0
         where t.group_acticity_id in