springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/NewStriveAppApi.java
@@ -645,6 +645,21 @@ /** * 每日签到记录列表 前15条 * @param userId * @param communityId * @return */ @ApiOperation(value = "每日签到记录列表 前15条", response = IntegratingTaskVO.class) @GetMapping("/IntegratingTask/getEverydayList") public R getEverydayList() { return newStriveForFeign.getEverydayList(getUserId()+"",getCommunityId()+""); } /** * 添加或者修改积分 * @param item * @return springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/building/IntegratingTaskVO.java
@@ -30,6 +30,10 @@ @ApiModelProperty(value = "用户id") private String userId; @ApiModelProperty(value = "积分") private String num; @ApiModelProperty(value = "社区id") private String communityId;
@@ -409,6 +409,18 @@ @PostMapping("/IntegratingTask/upIntegral") public R upIntegral(@RequestBody NewFightIntegral item); /** * 每日签到记录列表 前15条 * @param userId * @param communityId * @return */ @GetMapping("/IntegratingTask/getEverydayList") public R getEverydayList(@RequestParam("userId") String userId, @RequestParam("communityId") String communityId); /******************************************************************************************************************* * springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/NewStriveApi.java
@@ -22,7 +22,7 @@ @Slf4j @Api(tags = {"双挣双评新模块-后台"}) @RestController @RequestMapping("/StriveFor/") @RequestMapping("/StriveFor") public class NewStriveApi extends BaseController {
@@ -5,7 +5,6 @@ import com.panzhihua.common.model.vos.community.building.IntegratingTaskVO; import com.panzhihua.service_dangjian.entity.IntegratingTask; import com.panzhihua.service_dangjian.service.ComActIntegralUsersService; import com.panzhihua.service_dangjian.service.NewFightConvenientMerchantService; import com.panzhihua.service_dangjian.service.NewFightIntegratingTaskService; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -61,4 +60,18 @@ /** * 每日签到记录列表 前15条 * @param userId * @param communityId * @return */ @GetMapping("/getEverydayList") public R getEverydayList(@RequestParam("userId") String userId, @RequestParam("communityId") String communityId) { return R.ok(taskService.getEverydayList(userId,communityId)); } } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/dao/NewFightIntegratingTaskDao.java
@@ -42,4 +42,21 @@ int truncateData(); /** * 每日签到记录列表 前15条 * @param userId * @param communityId * @return */ List<IntegratingTask> getEverydayList(@Param("userId") String userId, @Param("communityId") String communityId); /** * 添加每日签到记录 * @param item * @return */ int addEverydayData(@Param("item") IntegratingTaskVO item); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/entity/NewFightConvenientMerchant.java
@@ -26,7 +26,7 @@ /** * 主键id */ @TableId(type = IdType.AUTO) // @TableId(type = IdType.AUTO) @ApiModelProperty("商家ID") private String id;
@@ -47,4 +47,23 @@ R truncateData(); /** * 每日签到记录列表 前15条 * @param userId * @param communityId * @return */ List<IntegratingTask> getEverydayList(String userId, String communityId); /** * 添加每日签到记录 * @param item * @return */ R addEverydayData(IntegratingTaskVO item); } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComActIntegralUsersServiceImpl.java
@@ -136,17 +136,6 @@ //15查看微心愿 case "16": //查看随手拍 // item.setAddOrReduce(1); // item.setIntegralNum("1"); // break; case "17": //每日签到 IntegratingTask task2=taskService.getDetails(item.getUserId(), item.getCommunityId(),item.getType()); if(task2!=null && StringUtils.equals("2",task2.getIsDraw()) ) { return R.ok(); } item.setAddOrReduce(1); item.setIntegralNum("1"); IntegratingTaskVO taskVO2=new IntegratingTaskVO(); @@ -154,6 +143,20 @@ taskVO2.setId(item.getTaskId()); taskService.editData(taskVO2); break; case "17": //每日签到 // IntegratingTask task2=taskService.getDetails(item.getUserId(), // item.getCommunityId(),item.getType()); // if(task2!=null && StringUtils.equals("2",task2.getIsDraw()) ) // { // return R.ok(); // } item.setAddOrReduce(1); // IntegratingTaskVO taskVO2=new IntegratingTaskVO(); // taskVO2.setIsDraw("2"); // taskVO2.setId(item.getTaskId()); // taskService.editData(taskVO2); break; case "18": //上传“随手拍”或“微心愿 item.setAddOrReduce(1); springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightIntegratingTaskServiceImpl.java
@@ -1,13 +1,17 @@ package com.panzhihua.service_dangjian.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.panzhihua.common.model.dtos.partybuilding.NewFightIntegral; import com.panzhihua.common.model.vos.R; import com.panzhihua.common.model.vos.community.building.IntegratingTaskVO; import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.service_dangjian.dao.NewFightIntegratingTaskDao; import com.panzhihua.service_dangjian.entity.IntegratingTask; import com.panzhihua.service_dangjian.service.ComActIntegralUsersService; import com.panzhihua.service_dangjian.service.NewFightIntegratingTaskService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; /** @@ -20,6 +24,11 @@ public class NewFightIntegratingTaskServiceImpl extends ServiceImpl<NewFightIntegratingTaskDao, IntegratingTask> implements NewFightIntegratingTaskService { @Resource private ComActIntegralUsersService usersService; @Override public List<IntegratingTask> getList(String userId, String communityId) @@ -51,19 +60,38 @@ //15查看微心愿 case "16": //查看随手拍 case "17": //每日签到 IntegratingTask task=baseMapper.getDetails(item.getUserId(),item.getCommunityId(),item.getStatus()); if(task!=null) { return R.ok(); } break; case "17": //每日签到 IntegratingTask task2=baseMapper.getDetails(item.getUserId(),item.getCommunityId(),item.getStatus()); if(task2!=null) { return R.ok(); } item.setIsDraw("2"); break; } int num=baseMapper.addData(item); if(num>0) { if(StringUtils.equals("17",item.getStatus())) { NewFightIntegral integral=new NewFightIntegral(); integral.setUserId(item.getUserId()); integral.setCommunityId(item.getCommunityId()); integral.setType("17"); integral.setIntegralNum(item.getNum()); usersService.upIntegral(integral); //新增每日用户签到记录 baseMapper.addEverydayData(item); } return R.ok(); } return R.fail("操作失败"); @@ -101,5 +129,21 @@ return R.fail("操作失败"); } @Override public List<IntegratingTask> getEverydayList(String userId, String communityId) { return baseMapper.getEverydayList(userId,communityId); } @Override public R addEverydayData(IntegratingTaskVO item) { int num= baseMapper.addEverydayData(item); if(num>0) { return R.ok(); } return R.fail("操作失败"); } } springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/resources/mapper/NewStriveIntegratingTaskMapper.xml
@@ -136,4 +136,84 @@ </delete> <!-- 分页查询 --> <select id="getEverydayList" resultMap="itemMap"> select id, user_id, community_id, creation_time from new_strive_everyday_register <where> 1=1 <if test="communityId !=null and communityId !='' "> and community_id=#{communityId} </if> <if test="userId !=null and userId !='' "> and user_id=#{userId} </if> </where> order by creation_time desc LIMIT 15 </select> <insert id="addEverydayData"> insert into new_strive_everyday_register <trim prefix="(" suffix=")" suffixOverrides=","> <if test="item.id != null and item.id != '' "> id, </if> <if test="item.isDraw != null and item.isDraw != '' "> is_draw, </if> <if test="item.status != null and item.status != '' "> status, </if> <if test="item.userId != null and item.userId != '' "> user_id, </if> <if test="item.communityId !=null and item.communityId !='' "> community_id, </if> creation_time </trim> values <trim prefix="(" suffix=")" suffixOverrides=","> <if test="item.id != null and item.id != '' "> #{item.id}, </if> <if test="item.isDraw != null and item.isDraw != '' "> #{item.isDraw}, </if> <if test="item.status != null and item.status != '' "> #{item.status}, </if> <if test="item.userId != null and item.userId != '' "> #{item.userId}, </if> <if test="item.communityId !=null and item.communityId !='' "> #{item.communityId}, </if> sysdate() </trim> </insert> </mapper>
