拼团购后台接口优化

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java

@@ -228,7 +228,7 @@ public class ApiCustomInfoController {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO>>
      **/
     @GetMapping("groupBuy/getGroupBuySignUpList")
-    public Result<List<EpdcSelectSignUpInfoListResultDTO>> getGroupBuySignUpList(@RequestBody EpdcSelectSignUpInfoListFormDTO formDTO) {
+    public Result<List<EpdcSelectSignUpInfoListResultDTO>> getGroupBuySignUpList(EpdcSelectSignUpInfoListFormDTO formDTO) {
         return customService.getGroupBuySignUpList(formDTO);
     }
     /**
@@ -262,7 +262,7 @@ public class ApiCustomInfoController {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO>>
      **/
     @GetMapping("groupBuy/getEvaluationList")
-    public Result<List<EpdcSelectEvaluationListResultDTO>> getEvaluationList(@RequestBody EpdcSelectEvaluationListFormDTO formDTO) {
+    public Result<List<EpdcSelectEvaluationListResultDTO>> getEvaluationList(EpdcSelectEvaluationListFormDTO formDTO) {
         return customService.getEvaluationList(formDTO);
     }
 
@@ -277,7 +277,28 @@ public class ApiCustomInfoController {
     public Result updateStatus(@RequestBody EpdcUpdateStatusFormDTO formDTO) {
         return customService.updateStatus(formDTO);
     }
-
+    /**
+     * @Description  我的参与
+     * @Author songyunpeng
+     * @Date  2020/12/2
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO>>
+     **/
+    @GetMapping("groupBuy/getMyGroupBuyJoin")
+    public Result<List<EpdcSelectMyGroupBuyJoinInfoListResultDTO>> getMyGroupBuyJoin(@LoginUser TokenDto tokenDto, EpdcSelectMyGroupBuyJoinInfoListFormDTO formDTO) {
+        return customService.getMyGroupBuyJoin(tokenDto,formDTO);
+    }
+    /**
+     * @Description  我的发布
+     * @Author songyunpeng
+     * @Date  2020/12/2
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO>>
+     **/
+    @GetMapping("groupBuy/getMyGroupBuyPublish")
+    public Result<List<EpdcSelectMyGroupBuyPublishInfoListResultDTO>> getMyGroupBuyPublish(@LoginUser TokenDto tokenDto, EpdcSelectMyGroupBuyPublishInfoListFormDTO formDTO) {
+        return customService.getMyGroupBuyPublish(tokenDto,formDTO);
+    }
 
 
     /**

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java

@@ -233,7 +233,7 @@ public interface CustomFeignClient {
      * @Param [formDTO]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO>>
      **/
-    @GetMapping(value = "custom/epdc-app/groupBuy/signUpOrCancel", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = "custom/epdc-app/groupBuy/signUpOrCancel", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result signUpOrCancel(@RequestBody EpdcSignUpOrCancelFormDTO formDTO);
     /**
      * @Description  获取交易列表
@@ -251,7 +251,7 @@ public interface CustomFeignClient {
      * @Param [formDTO]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO>>
      **/
-    @GetMapping(value = "custom/epdc-app/groupBuy/tradeConfirmation", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = "custom/epdc-app/groupBuy/tradeConfirmation", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result tradeConfirmation(@RequestBody EpdcTradeConfirmationFormDTO formDTO);
     /**
      * @Description  评价
@@ -260,7 +260,7 @@ public interface CustomFeignClient {
      * @Param [formDTO]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO>>
      **/
-    @GetMapping(value = "custom/epdc-app/groupBuy/evaluation", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = "custom/epdc-app/groupBuy/evaluation", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result evaluation(@RequestBody EpdcEvaluationGroupBuyFormDTO formDTO);
 
     /**
@@ -279,7 +279,7 @@ public interface CustomFeignClient {
      * @Param [formDTO]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO>>
      **/
-    @GetMapping(value = "custom/epdc-app/groupBuy/updateStatus", consumes = MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = "custom/epdc-app/groupBuy/updateStatus", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result updateStatus(@RequestBody EpdcUpdateStatusFormDTO formDTO);
 
 

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java

@@ -285,7 +285,7 @@ public interface CustomService {
      * @Date 2020/12/23
      * @Param [formDTO]
      **/
-    Result<List<EpdcSelectMyGroupBuyJoinInfoListResultDTO>> getMyGroupBuyJoin(EpdcSelectMyGroupBuyJoinInfoListFormDTO formDTO);
+    Result<List<EpdcSelectMyGroupBuyJoinInfoListResultDTO>> getMyGroupBuyJoin(TokenDto tokenDto, EpdcSelectMyGroupBuyJoinInfoListFormDTO formDTO);
 
     /**
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.result.EpdcSelectMyGroupBuyPublishInfoListResultDTO>>
@@ -294,7 +294,7 @@ public interface CustomService {
      * @Date 2020/12/23
      * @Param [formDTO]
      **/
-    Result<List<EpdcSelectMyGroupBuyPublishInfoListResultDTO>> getMyGroupBuyPublish(EpdcSelectMyGroupBuyPublishInfoListFormDTO formDTO);
+    Result<List<EpdcSelectMyGroupBuyPublishInfoListResultDTO>> getMyGroupBuyPublish(TokenDto tokenDto, EpdcSelectMyGroupBuyPublishInfoListFormDTO formDTO);
 
     /**
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.result.EpdcSelectSignUpInfoListResultDTO>>

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java

@@ -201,10 +201,10 @@ public class CustomServiceImpl implements CustomService {
             return new Result<List<EpdcSelectGroupBuyInfoListResultDTO>>().error("无效的token");
         }
         //验证是否是志愿者
-        Result<VolunteerInfoDTO> volunteerInfoDTOResult = userFeignClient.selectUserVolunteerInfo(tokenDto.getUserId());
+        /*Result<VolunteerInfoDTO> volunteerInfoDTOResult = userFeignClient.selectUserVolunteerInfo(tokenDto.getUserId());
         if(volunteerInfoDTOResult==null || volunteerInfoDTOResult.getData()==null || StringUtils.isBlank(volunteerInfoDTOResult.getData().getId())){
             return new Result().error("未查到该用户志愿者信息！");
-        }
+        }*/
         formDTO.setUserId(tokenDto.getUserId());
         formDTO.setFaceImg(tokenDto.getFaceImg());
         formDTO.setRealName(tokenDto.getRealName());
@@ -310,12 +310,20 @@ public class CustomServiceImpl implements CustomService {
     }
 
     @Override
-    public Result<List<EpdcSelectMyGroupBuyJoinInfoListResultDTO>> getMyGroupBuyJoin(EpdcSelectMyGroupBuyJoinInfoListFormDTO formDTO) {
-        return customFeignClient.getMyGroupBuyJoin(formDTO);
+    public Result<List<EpdcSelectMyGroupBuyJoinInfoListResultDTO>> getMyGroupBuyJoin(TokenDto tokenDto, EpdcSelectMyGroupBuyJoinInfoListFormDTO formDTO) {
+        if(StringUtils.isBlank(tokenDto.getUserId())){
+            return new Result<List<EpdcSelectMyGroupBuyJoinInfoListResultDTO>>().error("无效的token");
+        }
+        formDTO.setUserId(tokenDto.getUserId());
+	    return customFeignClient.getMyGroupBuyJoin(formDTO);
     }
 
     @Override
-    public Result<List<EpdcSelectMyGroupBuyPublishInfoListResultDTO>> getMyGroupBuyPublish(EpdcSelectMyGroupBuyPublishInfoListFormDTO formDTO) {
+    public Result<List<EpdcSelectMyGroupBuyPublishInfoListResultDTO>> getMyGroupBuyPublish(TokenDto tokenDto, EpdcSelectMyGroupBuyPublishInfoListFormDTO formDTO) {
+        if(StringUtils.isBlank(tokenDto.getUserId())){
+            return new Result<List<EpdcSelectMyGroupBuyPublishInfoListResultDTO>>().error("无效的token");
+        }
+        formDTO.setUserId(tokenDto.getUserId());
         return customFeignClient.getMyGroupBuyPublish(formDTO);
     }
 
@@ -337,7 +345,8 @@ public class CustomServiceImpl implements CustomService {
         formDTO.setFaceImg(tokenDto.getFaceImg());
         formDTO.setNickname(tokenDto.getNickname());
         formDTO.setUserId(tokenDto.getUserId());
-        return customFeignClient.evaluation(formDTO);    }
+        return customFeignClient.evaluation(formDTO);
+	}
 
     @Override
     public Result<List<EpdcSelectEvaluationListResultDTO>> getEvaluationList(EpdcSelectEvaluationListFormDTO formDTO) {

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSignUpOrCancelFormDTO.java

@@ -39,7 +39,7 @@ public class EpdcSignUpOrCancelFormDTO implements Serializable {
      * 拼团购ID
      */
     @NotBlank(message ="拼团购ID不能为空")
-    private String id;
+    private String groupBuyId;
     /**
      * 状态
      */

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyEvaluationServiceImpl.java

@@ -122,7 +122,7 @@ public class GroupBuyEvaluationServiceImpl extends BaseServiceImpl<GroupBuyEvalu
                 customImgService.insert(customImgEntity);
             });
         }
-        return null;
+        return new Result();
     }
 
     @Override

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuySignUpServiceImpl.java

@@ -119,7 +119,7 @@ public class GroupBuySignUpServiceImpl extends BaseServiceImpl<GroupBuySignUpDao
     @Override
     public Result signUpOrCancel(EpdcSignUpOrCancelFormDTO formDTO) {
         Map<String,Object> params = new HashMap<>();
-        params.put("GROUP_BUY_ID",formDTO.getId());
+        params.put("GROUP_BUY_ID",formDTO.getGroupBuyId());
         params.put("USER_ID",formDTO.getUserId());
         List<GroupBuySignUpEntity> groupBuySignUpEntities = baseDao.selectByMap(params);
         if(10 == formDTO.getStatus()){
@@ -144,6 +144,7 @@ public class GroupBuySignUpServiceImpl extends BaseServiceImpl<GroupBuySignUpDao
                 }
             }else {
                 GroupBuySignUpEntity groupBuySignUpEntity = ConvertUtils.sourceToTarget(formDTO,GroupBuySignUpEntity.class);
+                groupBuySignUpEntity.setSignUpTime(new Date());
                 insert(groupBuySignUpEntity);
             }
         }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuyEvaluationDao.xml

@@ -38,7 +38,9 @@
         from epdc_group_buy_evaluation t
         left join
              (select * from epdc_custom_img order by IMG_URL) t1
-             on t.ID = t1.REFERENCE_ID and t1.IMG_TYPE = 'group_buy_evaluation' and t1.DEL_FLAG = '0'
+             on t.GROUP_BUY_ID = t1.REFERENCE_ID and t1.IMG_TYPE = 'group_buy_evaluation' and t1.DEL_FLAG = '0'
+         where t.DEL_FLAG = '0' and t.GROUP_BUY_ID = #{groupBuyId} and t.SHIELD_FLAG = '0'
+         order by t.CREATED_TIME desc
     </select>
 
 

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuyInfoDao.xml

@@ -139,8 +139,8 @@
            t.GROUP_BUY_STATUS,
            t.CREATED_TIME as groupBuyPublishTime,
            t1.IMG_URL,
-           if((select 1 from epdc_group_buy_evaluation egbe where egbe.DEL_FLAG='0' and egbe.USER_ID = t2.USER_ID
-               and egbe.GROUP_BUY_ID = t.ID) is null,0,1)isEvaluation
+           if((select count(1) from epdc_group_buy_evaluation egbe where egbe.DEL_FLAG='0' and egbe.USER_ID = t2.USER_ID
+               and egbe.GROUP_BUY_ID = t.ID) = 0,0,1)isEvaluation
         from epdc_group_buy_info t
                  left join
                  (select * from epdc_custom_img order by IMG_URL) t1
@@ -196,6 +196,7 @@
            SIGN_UP_STATUS
         from epdc_group_buy_sign_up
         where DEL_FLAG ='0' and SIGN_UP_STATUS != 10
+        and GROUP_BUY_ID = #{id} and SIGN_UP_STATUS != 10
         order by CREATED_TIME desc
         LIMIT #{pageIndex},#{pageSize}
     </select>