Merge remote-tracking branch 'remotes/origin/dev'

epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/service/impl/BizPointTotalDetailServiceImpl.java

@@ -29,6 +29,7 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.BizPointTotalDetailDao;
 import com.epmet.dto.BizPointTotalDetailDTO;
 import com.epmet.dto.form.GroupPointFormDTO;
+import com.epmet.resi.group.dto.group.form.GroupPointDetailFormDTO;
 import com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO;
 import com.epmet.dto.result.GroupPointRankingResultDTO;
 import com.epmet.entity.BizPointTotalDetailEntity;
@@ -140,16 +141,20 @@ public class BizPointTotalDetailServiceImpl extends BaseServiceImpl<BizPointTota
      */
     @Override
     public GroupPointDetailResultDTO pointDetail(GroupPointFormDTO formDTO) {
-        Result<GroupPointDetailResultDTO> result = resiGroupOpenFeignClient.groupPointDetail(formDTO.getGroupId());
-        if (!result.success() || null == result.getData()) {
-            throw new RenException(result.getCode(), result.getMsg());
-        }
-        GroupPointDetailResultDTO detail = result.getData();
         QueryWrapper<BizPointTotalDetailEntity> wrapper = new QueryWrapper<>();
         wrapper.eq("BIZ_TYPE", "group")
                 .eq("OBJECT_ID", formDTO.getGroupId())
                 .eq("DEL_FLAG", NumConstant.ZERO_STR);
         BizPointTotalDetailEntity entity = baseDao.selectOne(wrapper);
+
+        GroupPointDetailFormDTO groupPointDetailFormDTO = new GroupPointDetailFormDTO();
+        groupPointDetailFormDTO.setGroupId(formDTO.getGroupId());
+        groupPointDetailFormDTO.setPoint(null == entity?NumConstant.ZERO:entity.getTotalPoint());
+        Result<GroupPointDetailResultDTO> result = resiGroupOpenFeignClient.groupPointDetail(groupPointDetailFormDTO);
+        if (!result.success() || null == result.getData()) {
+            throw new RenException(result.getCode(), result.getMsg());
+        }
+        GroupPointDetailResultDTO detail = result.getData();
         Integer increase = userPointActionLogService.getIncrease("group", formDTO.getGroupId());
         detail.setIncrease(increase.toString());
         if (null == entity) {

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/PaCustomerController.java

@@ -6,7 +6,6 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
-import com.epmet.dto.CustomerMpDTO;
 import com.epmet.dto.PaCustomerDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
@@ -96,7 +95,7 @@ public class PaCustomerController {
      * @Description  查询公众号注册的客户信息列表
      **/
     @PostMapping("registerinfo")
-    public Result<PageData> registerInfo(@LoginUser TokenDto tokenDTO, @RequestBody RegisterInfoFormDTO formDTO) {
+    public Result<PageData> registerInfo( @RequestBody RegisterInfoFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
         return new Result<PageData>().ok(paCustomerService.registerInfo(formDTO));
     }
@@ -140,7 +139,7 @@ public class PaCustomerController {
     /**
      * 获取小程序基础库版本
      * @author zhaoqifeng
-     * @date 2020/8/5 16:55 
+     * @date 2020/8/5 16:55
      * @param formDTO
      * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.SupportVersionResultDTO>
      */

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/form/GroupPointDetailFormDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.resi.group.dto.group.form;
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2021/6/24 10:50
+ */
+@Data
+public class GroupPointDetailFormDTO implements Serializable {
+	private static final long serialVersionUID = 2668579587643641113L;
+	private String groupId;
+	private Integer point;
+}

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/feign/ResiGroupOpenFeignClient.java

@@ -246,11 +246,11 @@ public interface ResiGroupOpenFeignClient {
      * 小组积分详情
      * @author zhaoqifeng
      * @date 2021/4/21 16:30
-     * @param groupId
+     * @param formDTO
      * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO>
      */
-    @PostMapping("resi/group/group/groupPointDetail/{groupId}")
+    @PostMapping("resi/group/group/groupPointDetail")
-    Result<GroupPointDetailResultDTO> groupPointDetail(@PathVariable String groupId);
+    Result<GroupPointDetailResultDTO> groupPointDetail(@RequestBody GroupPointDetailFormDTO formDTO);
 
     /**
      * @Description  查询话题的创建者

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/controller/ResiGroupController.java

@@ -558,12 +558,12 @@ public class ResiGroupController {
      * 小组积分详情
      * @author zhaoqifeng
      * @date 2021/4/21 16:22
-     * @param groupId
+     * @param formDTO
      * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO>
      */
     @PostMapping("groupPointDetail/{groupId}")
-    public Result<GroupPointDetailResultDTO> groupPointDetail(@PathVariable String groupId) {
+    public Result<GroupPointDetailResultDTO> groupPointDetail(@RequestBody GroupPointDetailFormDTO formDTO) {
-        return new Result<GroupPointDetailResultDTO>().ok(resiGroupService.groupPointDetail(groupId));
+        return new Result<GroupPointDetailResultDTO>().ok(resiGroupService.groupPointDetail(formDTO));
     }
 
     /**

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java

@@ -404,10 +404,10 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
 	 * 小组积分详情
 	 * @author zhaoqifeng
 	 * @date 2021/4/21 16:22
-	 * @param groupId
+	 * @param formDTO
 	 * @return com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO
 	 */
-	GroupPointDetailResultDTO groupPointDetail(String groupId);
+	GroupPointDetailResultDTO groupPointDetail(GroupPointDetailFormDTO formDTO);
 
 	/**
 	 * 小组近段时间实现的成就列表

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -1318,20 +1318,30 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	/**
 	 * 小组积分详情
 	 *
-	 * @param groupId
+	 * @param formDTO
 	 * @return com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO
 	 * @author zhaoqifeng
 	 * @date 2021/4/21 16:22
 	 */
 	@Override
-	public GroupPointDetailResultDTO groupPointDetail(String groupId) {
+	public GroupPointDetailResultDTO groupPointDetail(GroupPointDetailFormDTO formDTO) {
 		GroupPointDetailResultDTO result = new GroupPointDetailResultDTO();
-		ResiGroupEntity group = baseDao.selectById(groupId);
+		ResiGroupEntity group = baseDao.selectById(formDTO.getGroupId());
-		Integer nextLevel = group.getLevel() + 1;
+		Integer level = GroupLevelUtils.getLevel(formDTO.getPoint());
+		if (null == level) {
+			level = 1;
+		}
+		Integer nextLevel = level + 1;
 		Integer nextLevelPoint = GroupLevelUtils.getPoint(nextLevel);
-		result.setLevel("LV" + group.getLevel().toString());
+		result.setLevel("LV" + level.toString());
 		result.setNextLevel("LV" + nextLevel.toString());
 		result.setNextLevelPoint(nextLevelPoint.toString());
+		if (!level.equals(group.getLevel())) {
+			ResiGroupEntity entity = new ResiGroupEntity();
+			entity.setId(group.getId());
+			entity.setLevel(level);
+			baseDao.updateById(entity);
+		}
 		return result;
 	}