Merge branch 'dev_bugfix_ljj' into develop

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/feign/fallback/ResiGroupOpenFeignClientFallback.java

@@ -25,6 +25,7 @@ import com.epmet.resi.group.dto.topic.result.TopicInfoResultDTO;
 import com.epmet.resi.group.feign.ResiGroupOpenFeignClient;
 import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.HashMap;
 import java.util.List;
@@ -197,14 +198,14 @@ public class ResiGroupOpenFeignClientFallback implements ResiGroupOpenFeignClien
     /**
      * 小组积分详情
      *
-     * @param groupId
+     * @param formDTO
      * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.group.result.GroupPointDetailResultDTO>
      * @author zhaoqifeng
      * @date 2021/4/21 16:30
      */
     @Override
-    public Result<GroupPointDetailResultDTO> groupPointDetail(String groupId) {
+    public Result<GroupPointDetailResultDTO> groupPointDetail(@RequestBody GroupPointDetailFormDTO formDTO) {
-        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "groupPointDetail", groupId);
+        return ModuleUtils.feignConError(ServiceConstant.RESI_GROUP_SERVER, "groupPointDetail", formDTO);
     }
 
     @Override