拼团购后台接口提交

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

@@ -155,9 +155,9 @@ public class ApiCustomInfoController {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO>>
      **/
     @GetMapping("groupBuy/getGroupBuyList")
-    public Result<List<EpdcSelectGroupBuyInfoListResultDTO>> getGroupBuyList( @LoginUser TokenDto tokenDto, EpdcSelectGroupBuyInfoListFormDTO formDTO) {
+    public Result<List<EpdcSelectGroupBuyInfoListResultDTO>> getGroupBuyList(EpdcSelectGroupBuyInfoListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
-        return customService.getGroupBuyList(tokenDto,formDTO);
+        return customService.getGroupBuyList(formDTO);
     }
 
     /**
@@ -168,8 +168,10 @@ public class ApiCustomInfoController {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyDetailResultDTO>
      **/
     @GetMapping("groupBuy/getGroupBuyDetail/{id}")
-    public Result<EpdcSelectGroupBuyDetailResultDTO> getGroupBuyDetail(@PathVariable String id) {
-        return customService.getGroupBuyDetail(id);
+    public Result<EpdcSelectGroupBuyDetailResultDTO> getGroupBuyDetail(@LoginUser TokenDto tokenDto,@PathVariable String id) {
+        EpdcSelectGroupBuyDetailFormDTO epdcSelectGroupBuyDetailFormDTO = new EpdcSelectGroupBuyDetailFormDTO();
+        epdcSelectGroupBuyDetailFormDTO.setId(id);
+        return customService.getGroupBuyDetail(tokenDto,epdcSelectGroupBuyDetailFormDTO);
     }
 
     /**
@@ -207,7 +209,74 @@ public class ApiCustomInfoController {
     public Result callGroupBuyMobile(@PathVariable String id) {
         return customService.callGroupBuyMobile(id);
     }
+    /**
+     * @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>>
+     **/
+    @PostMapping("groupBuy/signUpOrCancel")
+    public Result signUpOrCancel(@LoginUser TokenDto tokenDto,@RequestBody EpdcSignUpOrCancelFormDTO formDTO) {
+        return customService.signUpOrCancel(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/getGroupBuySignUpList")
+    public Result<List<EpdcSelectSignUpInfoListResultDTO>> getGroupBuySignUpList(@RequestBody EpdcSelectSignUpInfoListFormDTO formDTO) {
+        return customService.getGroupBuySignUpList(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>>
+     **/
+    @PostMapping("groupBuy/tradeConfirmation")
+    public Result tradeConfirmation(@RequestBody EpdcTradeConfirmationFormDTO formDTO) {
+        return customService.tradeConfirmation(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>>
+     **/
+    @PostMapping("groupBuy/evaluation")
+    public Result evaluation(@LoginUser TokenDto tokenDto,@RequestBody EpdcEvaluationGroupBuyFormDTO formDTO) {
+        return customService.evaluation(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/getEvaluationList")
+    public Result<List<EpdcSelectEvaluationListResultDTO>> getEvaluationList(@RequestBody EpdcSelectEvaluationListFormDTO formDTO) {
+        return customService.getEvaluationList(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>>
+     **/
+    @PostMapping("groupBuy/updateStatus")
+    public Result updateStatus(@RequestBody EpdcUpdateStatusFormDTO formDTO) {
+        return customService.updateStatus(formDTO);
+    }
 
 
 

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

@@ -170,7 +170,24 @@ public interface CustomFeignClient {
      **/
     @GetMapping(value = "custom/epdc-app/groupBuy/getGroupBuyList", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<List<EpdcSelectGroupBuyInfoListResultDTO>> getGroupBuyList(@RequestBody EpdcSelectGroupBuyInfoListFormDTO 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(value = "custom/epdc-app/groupBuy/getMyGroupBuyJoin", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<EpdcSelectMyGroupBuyJoinInfoListResultDTO>> getMyGroupBuyJoin(@RequestBody EpdcSelectMyGroupBuyJoinInfoListFormDTO 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(value = "custom/epdc-app/groupBuy/getMyGroupBuyPublish", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<EpdcSelectMyGroupBuyPublishInfoListResultDTO>> getMyGroupBuyPublish(@RequestBody EpdcSelectMyGroupBuyPublishInfoListFormDTO formDTO);
     /**
      * @Description  详情
      * @Author songyunpeng
@@ -179,7 +196,7 @@ public interface CustomFeignClient {
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyDetailResultDTO>
      **/
     @GetMapping(value = "custom/epdc-app/groupBuy/getGroupBuyDetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<EpdcSelectGroupBuyDetailResultDTO> getGroupBuyDetail(@PathVariable String id);
+    Result<EpdcSelectGroupBuyDetailResultDTO> getGroupBuyDetail(@RequestBody  EpdcSelectGroupBuyDetailFormDTO epdcSelectGroupBuyDetailFormDTO);
 
     /**
      * @Description  发布或更新
@@ -209,7 +226,61 @@ public interface CustomFeignClient {
      **/
     @GetMapping(value = "custom/epdc-app/groupBuy/callMobile/{id}", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result callGroupBuyMobile(@PathVariable String id);
+    /**
+     * @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(value = "custom/epdc-app/groupBuy/signUpOrCancel", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result signUpOrCancel(@RequestBody EpdcSignUpOrCancelFormDTO 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(value = "custom/epdc-app/groupBuy/getGroupBuySignUpList", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<EpdcSelectSignUpInfoListResultDTO>> getGroupBuySignUpList(@RequestBody EpdcSelectSignUpInfoListFormDTO 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(value = "custom/epdc-app/groupBuy/tradeConfirmation", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result tradeConfirmation(@RequestBody EpdcTradeConfirmationFormDTO 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(value = "custom/epdc-app/groupBuy/evaluation", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result evaluation(@RequestBody EpdcEvaluationGroupBuyFormDTO 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(value = "custom/epdc-app/groupBuy/getEvaluationList", consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<EpdcSelectEvaluationListResultDTO>> getEvaluationList(@RequestBody EpdcSelectEvaluationListFormDTO 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(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/feign/fallback/CustomFeignClientFallback.java

@@ -100,8 +100,18 @@ public class CustomFeignClientFallback implements CustomFeignClient {
     }
 
     @Override
-    public Result<EpdcSelectGroupBuyDetailResultDTO> getGroupBuyDetail(String id) {
-        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getGroupBuyDetail", id);
+    public Result<List<EpdcSelectMyGroupBuyJoinInfoListResultDTO>> getMyGroupBuyJoin(EpdcSelectMyGroupBuyJoinInfoListFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getMyGroupBuyJoin", formDTO);
+    }
+
+    @Override
+    public Result<List<EpdcSelectMyGroupBuyPublishInfoListResultDTO>> getMyGroupBuyPublish(EpdcSelectMyGroupBuyPublishInfoListFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getMyGroupBuyPublish", formDTO);
+    }
+
+    @Override
+    public Result<EpdcSelectGroupBuyDetailResultDTO> getGroupBuyDetail(EpdcSelectGroupBuyDetailFormDTO epdcSelectGroupBuyDetailFormDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getGroupBuyDetail", epdcSelectGroupBuyDetailFormDTO);
     }
 
     @Override
@@ -119,6 +129,36 @@ public class CustomFeignClientFallback implements CustomFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "callMobile", id);
     }
 
+    @Override
+    public Result signUpOrCancel(EpdcSignUpOrCancelFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "signUpOrCancel", formDTO);
+    }
+
+    @Override
+    public Result<List<EpdcSelectSignUpInfoListResultDTO>> getGroupBuySignUpList(EpdcSelectSignUpInfoListFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getGroupBuySignUpList", formDTO);
+    }
+
+    @Override
+    public Result tradeConfirmation(EpdcTradeConfirmationFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "tradeConfirmation", formDTO);
+    }
+
+    @Override
+    public Result evaluation(EpdcEvaluationGroupBuyFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "evaluation", formDTO);
+    }
+
+    @Override
+    public Result<List<EpdcSelectEvaluationListResultDTO>> getEvaluationList(EpdcSelectEvaluationListFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getEvaluationList", formDTO);
+    }
+
+    @Override
+    public Result updateStatus(EpdcUpdateStatusFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "updateStatus", formDTO);
+    }
+
     @Override
     public Result<List<EpdcSelectSdsInfoListResultDTO>> getSdsList(EpdcSelectSdsInfoListFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getSdsList", formDTO);

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

@@ -15,234 +15,320 @@ import java.util.List;
  * @Date 2020/1/28 13:39
  */
 public interface CustomService {
-	/**
-	 * @param
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
-	 * @Author yinzuomei
-	 * @Description 获取所有组织机构信息
-	 * @Date 2020/1/28 12:14
-	 **/
-	Result<DeptOption> getDeptTree();
-
-	/**
-	 * @param formDTO
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result
-	 * @Author yinzuomei
-	 * @Description 疫情上报
-	 * @Date 2020/1/28 13:23
-	 **/
-	Result report(EpiDemicReportFormDTO formDTO);
-
-	/*
-	 * 移动端获取 了解锦水-模块管理接口
-	 *
-	 * @param
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcModuleResultDTO>>
-	 * @Author zhangyong
-	 * @Date 10:42 2020-05-20
-	 **/
-	@Deprecated
-	Result<List<EpdcModuleResultDTO>> listModule();
-
-	/**
-	 *
-	 * 根据模块分类获取模块
-	 *
-	 * @params [moduleCategory]
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcModuleResultDTO>>
-	 * @author liuchuang
-	 * @since 2020/7/15 17:44
-	 */
-	Result<List<EpdcModuleResultDTO>> listOfModuleByModuleCategory(String moduleCategory);
-
-	/**
-	 *  移动端获取 了解锦水-硬核管理接口
+    /**
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.DeptOption>
+     * @Author yinzuomei
+     * @Description 获取所有组织机构信息
+     * @Date 2020/1/28 12:14
+     **/
+    Result<DeptOption> getDeptTree();
+
+    /**
+     * @param formDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Author yinzuomei
+     * @Description 疫情上报
+     * @Date 2020/1/28 13:23
+     **/
+    Result report(EpiDemicReportFormDTO formDTO);
+
+    /*
+     * 移动端获取 了解锦水-模块管理接口
      *
-	 * @param formDTO
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcDeptInfoResultDTO>>
-	 * @Author zhangyong
-	 * @Date 13:41 2020-05-20
-	 **/
-	Result<List<EpdcDeptInfoResultDTO>> listDeptInfo(EpdcDeptInfoFormDTO formDTO);
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcModuleResultDTO>>
+     * @Author zhangyong
+     * @Date 10:42 2020-05-20
+     **/
+    @Deprecated
+    Result<List<EpdcModuleResultDTO>> listModule();
 
     /**
-     * @Description  获取有档案的归属部门列表
+     * 根据模块分类获取模块
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.result.EpdcModuleResultDTO>>
+     * @params [moduleCategory]
+     * @author liuchuang
+     * @since 2020/7/15 17:44
+     */
+    Result<List<EpdcModuleResultDTO>> listOfModuleByModuleCategory(String moduleCategory);
+
+    /**
+     * 移动端获取 了解锦水-硬核管理接口
+     *
+     * @param formDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.result.EpdcDeptInfoResultDTO>>
+     * @Author zhangyong
+     * @Date 13:41 2020-05-20
+     **/
+    Result<List<EpdcDeptInfoResultDTO>> listDeptInfo(EpdcDeptInfoFormDTO formDTO);
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO>>
+     * @Description 获取有档案的归属部门列表
      * @Author songyunpeng
-     * @Date  2020/7/7
+     * @Date 2020/7/7
      * @Param [formDTO]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO>>
      **/
     Result<List<ArchiveDeptResultDTO>> listArchiveDeptInfo(ArchiveDeptFormDTO formDTO);
+
     /**
-     * @Description  获取档案列表
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO>>
+     * @Description 获取档案列表
      * @Author songyunpeng
-     * @Date  2020/7/7
+     * @Date 2020/7/7
      * @Param [formDTO]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ArchiveDeptResultDTO>>
      **/
     Result<List<ArchiveResultDTO>> listArchivesInfo(ArchiveFormDTO formDTO);
+
     /**
-     * @Description  获取档案详情
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.ArchiveDetailResultDTO>
+     * @Description 获取档案详情
      * @Author songyunpeng
-     * @Date  2020/7/7
+     * @Date 2020/7/7
      * @Param [id]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.ArchiveDetailResultDTO>
      **/
     Result<ArchiveDetailResultDTO> getArchiveDetail(String id);
 
     /**
-     * @Description   特殊人群分析-人群分布接口
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.SpecialPopulationDistributionResultDTO>
+     * @Description 特殊人群分析-人群分布接口
      * @Author songyunpeng
-     * @Date  2020/11/4
+     * @Date 2020/11/4
      * @Param []
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.SpecialPopulationDistributionResultDTO>
      **/
     Result<SpecialPopulationDistributionResultDTO> selectPopulationDistribution();
+
     /**
-     * @Description   特殊人群分析-查人接口
+     * @param specialUserFormDTO
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.result.SpecialUserResultDTO>>
+     * @Description 特殊人群分析-查人接口
      * @Author songyunpeng
-     * @Date  2020/11/4
+     * @Date 2020/11/4
      * @Param []
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.result.SpecialUserResultDTO>>
-     * @param specialUserFormDTO*/
+     */
     Result<PageData<SpecialUserResultDTO>> selectPageSpecialUser(SpecialUserFormDTO specialUserFormDTO);
+
     /**
-     * @Description  特殊人群分析-详情接口
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.SpecialUserResultDTO>
+     * @Description 特殊人群分析-详情接口
      * @Author songyunpeng
-     * @Date  2020/11/4
+     * @Date 2020/11/4
      * @Param [suId]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.SpecialUserResultDTO>
      **/
     Result<SpecialUserResultDTO> selectSpecialUserDetail(String suId);
+
     /**
-     * @Description  特殊人群分析-残疾类别分布接口
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.SpecialUserDisabilityTypeResultDTO>
+     * @Description 特殊人群分析-残疾类别分布接口
      * @Author songyunpeng
-     * @Date  2020/11/4
+     * @Date 2020/11/4
      * @Param [specialUserDisabilityTypeFormDTO]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.SpecialUserDisabilityTypeResultDTO>
      **/
     Result<PageData<SpecialUserDisabilityTypeResultDTO>> selectDisabilityType(SpecialUserDisabilityTypeFormDTO specialUserDisabilityTypeFormDTO);
+
     /**
-     * @Description  特殊人群分析-月度补贴情况接口
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData < com.elink.esua.epdc.dto.result.SpecialUserMonthlySubsidyResultDTO>>
+     * @Description 特殊人群分析-月度补贴情况接口
      * @Author songyunpeng
-     * @Date  2020/11/4
+     * @Date 2020/11/4
      * @Param [dto]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.result.SpecialUserMonthlySubsidyResultDTO>>
      **/
     Result<PageData<SpecialUserMonthlySubsidyResultDTO>> selectMonthlySubsidy(SpecialUserMonthlySubsidyFormDTO dto);
 
     /**
      * 用户举报问题提交
      *
-     * @param formDto 提交信息
+     * @param formDto  提交信息
      * @param tokenDto 用户信息
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @author Liuchuang
      * @since 2020/10/22 18:01
      */
-	Result reportIssueSubmit(ReportIssueSubmitFormDTO formDto, TokenDto tokenDto);
-
-	/**
-	 * 用户举报问题列表
-	 *
-	 * @param formDto 参数
-	 * @param tokenDto 用户信息
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.ReportIssueResultDTO>>
-	 * @author Liuchuang
-	 * @since 2020/10/23 11:03
-	 */
-	Result<List<ReportIssueResultDTO>> listReportIssue(ReportIssueListFormDTO formDto, TokenDto tokenDto);
-
-	/**
-	 * 举报问题详情
-	 *
-	 * @param id 记录ID
-	 * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.ReportIssueResultDTO>
-	 * @author Liuchuang
-	 * @since 2020/10/23 10:40
-	 */
-	Result<ReportIssueResultDTO> getReportIssueById(String id);
-
-    /**
-     * @Description  获取首页列表
-     * @Author songyunpeng
-     * @Date  2020/12/2
+    Result reportIssueSubmit(ReportIssueSubmitFormDTO formDto, TokenDto tokenDto);
+
+    /**
+     * 用户举报问题列表
+     *
+     * @param formDto  参数
+     * @param tokenDto 用户信息
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.result.ReportIssueResultDTO>>
+     * @author Liuchuang
+     * @since 2020/10/23 11:03
+     */
+    Result<List<ReportIssueResultDTO>> listReportIssue(ReportIssueListFormDTO formDto, TokenDto tokenDto);
+
+    /**
+     * 举报问题详情
+     *
+     * @param id 记录ID
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.ReportIssueResultDTO>
+     * @author Liuchuang
+     * @since 2020/10/23 10:40
+     */
+    Result<ReportIssueResultDTO> getReportIssueById(String id);
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO>>
+     * @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>>
      **/
-    Result<List<EpdcSelectGroupBuyInfoListResultDTO>> getGroupBuyList(TokenDto tokenDto, EpdcSelectGroupBuyInfoListFormDTO formDTO);
+    Result<List<EpdcSelectGroupBuyInfoListResultDTO>> getGroupBuyList(EpdcSelectGroupBuyInfoListFormDTO formDTO);
+
     /**
-     * @Description  详情
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyDetailResultDTO>
+     * @Description 详情
      * @Author songyunpeng
-     * @Date  2020/12/2
+     * @Date 2020/12/2
      * @Param [id]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyDetailResultDTO>
      **/
-    Result<EpdcSelectGroupBuyDetailResultDTO> getGroupBuyDetail(String id);
+    Result<EpdcSelectGroupBuyDetailResultDTO> getGroupBuyDetail(TokenDto tokenDto, EpdcSelectGroupBuyDetailFormDTO epdcSelectGroupBuyDetailFormDTO);
+
     /**
-     * @Description  发布或更新
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyDetailResultDTO>
+     * @Description 发布或更新
      * @Author songyunpeng
-     * @Date  2020/12/2
+     * @Date 2020/12/2
      * @Param [formDTO]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyDetailResultDTO>
      **/
-    Result groupBuyPublishOrUpdate(TokenDto tokenDto,EpdcAddGroupBuyInfoFormDTO formDTO);
+    Result groupBuyPublishOrUpdate(TokenDto tokenDto, EpdcAddGroupBuyInfoFormDTO formDTO);
+
     /**
-     * @Description  删除
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Description 删除
      * @Author songyunpeng
-     * @Date  2020/12/2
+     * @Date 2020/12/2
      * @Param [id]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      **/
     Result deleteGroupBuy(String id);
+
     /**
-     * @Description  打电话计算次数
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Description 打电话计算次数
      * @Author songyunpeng
-     * @Date  2020/12/2
+     * @Date 2020/12/2
      * @Param [id]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      **/
     Result callGroupBuyMobile(String id);
 
 
     /**
-     * @Description  小程序-获取首页列表
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.result.EpdcSelectSdsInfoListResultDTO>>
+     * @Description 小程序-获取首页列表
      * @Author songyunpeng
-     * @Date  2020/12/3
+     * @Date 2020/12/3
      * @Param [formDTO]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcSelectSdsInfoListResultDTO>>
      **/
-    Result<List<EpdcSelectSdsInfoListResultDTO>> getSdsList(TokenDto tokenDto,EpdcSelectSdsInfoListFormDTO formDTO);
+    Result<List<EpdcSelectSdsInfoListResultDTO>> getSdsList(TokenDto tokenDto, EpdcSelectSdsInfoListFormDTO formDTO);
+
     /**
-     * @Description   小程序-获取列表详情
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcSelectSdsInfoDetailResultDTO>
+     * @Description 小程序-获取列表详情
      * @Author songyunpeng
-     * @Date  2020/12/3
+     * @Date 2020/12/3
      * @Param [id]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcSelectSdsInfoDetailResultDTO>
      **/
     Result<EpdcSelectSdsInfoDetailResultDTO> getSdsDetail(String id);
+
     /**
-     * @Description  小程序- 发布或更新
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Description 小程序- 发布或更新
      * @Author songyunpeng
-     * @Date  2020/12/3
+     * @Date 2020/12/3
      * @Param [formDTO]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      **/
-    Result sdsPublishOrUpdate(TokenDto tokenDto,EpdcAddSdsFormDTO formDTO);
+    Result sdsPublishOrUpdate(TokenDto tokenDto, EpdcAddSdsFormDTO formDTO);
+
     /**
-     * @Description  小程序 - 删除
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Description 小程序 - 删除
      * @Author songyunpeng
-     * @Date  2020/12/3
+     * @Date 2020/12/3
      * @Param [id]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      **/
     Result deleteSds(String id);
+
     /**
-     * @Description  小程序 - 计算打电话次数
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Description 小程序 - 计算打电话次数
      * @Author songyunpeng
-     * @Date  2020/12/3
+     * @Date 2020/12/3
      * @Param [id]
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      **/
     Result callSdsMobile(String id);
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Description 交易确认
+     * @Author songyunpeng
+     * @Date 2020/12/23
+     * @Param [formDTO]
+     **/
+    Result tradeConfirmation(EpdcTradeConfirmationFormDTO formDTO);
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Description 报名/取消报名
+     * @Author songyunpeng
+     * @Date 2020/12/24
+     * @Param [formDTO]
+     **/
+    Result signUpOrCancel(TokenDto tokenDto, EpdcSignUpOrCancelFormDTO formDTO);
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.result.EpdcSelectMyGroupBuyJoinInfoListResultDTO>>
+     * @Description 我的参与
+     * @Author songyunpeng
+     * @Date 2020/12/23
+     * @Param [formDTO]
+     **/
+    Result<List<EpdcSelectMyGroupBuyJoinInfoListResultDTO>> getMyGroupBuyJoin(EpdcSelectMyGroupBuyJoinInfoListFormDTO formDTO);
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.result.EpdcSelectMyGroupBuyPublishInfoListResultDTO>>
+     * @Description 我的发布
+     * @Author songyunpeng
+     * @Date 2020/12/23
+     * @Param [formDTO]
+     **/
+    Result<List<EpdcSelectMyGroupBuyPublishInfoListResultDTO>> getMyGroupBuyPublish(EpdcSelectMyGroupBuyPublishInfoListFormDTO formDTO);
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.result.EpdcSelectSignUpInfoListResultDTO>>
+     * @Description 获取交易列表
+     * @Author songyunpeng
+     * @Date 2020/12/23
+     * @Param [formDTO]
+     **/
+    Result<List<EpdcSelectSignUpInfoListResultDTO>> getGroupBuySignUpList(EpdcSelectSignUpInfoListFormDTO formDTO);
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Description 我的发布取消/结束
+     * @Author songyunpeng
+     * @Date 2020/12/24
+     * @Param [formDTO]
+     **/
+    Result updateStatus(EpdcUpdateStatusFormDTO formDTO);
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Description 评价
+     * @Author songyunpeng
+     * @Date 2020/12/24
+     * @Param [formDTO]
+     **/
+    Result evaluation(TokenDto tokenDto, EpdcEvaluationGroupBuyFormDTO formDTO);
+
+    /**
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.result.EpdcSelectEvaluationListResultDTO>>
+     * @Description 获取评价列表
+     * @Author songyunpeng
+     * @Date 2020/12/24
+     * @Param [formDTO]
+     **/
+    Result<List<EpdcSelectEvaluationListResultDTO>> getEvaluationList(EpdcSelectEvaluationListFormDTO formDTO);
 }

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

@@ -1,7 +1,6 @@
 package com.elink.esua.epdc.service.impl;
 
 import com.elink.esua.epdc.common.token.dto.TokenDto;
-import com.elink.esua.epdc.commons.tools.annotation.LoginUser;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
@@ -183,17 +182,17 @@ public class CustomServiceImpl implements CustomService {
 	}
 
     @Override
-    public Result<List<EpdcSelectGroupBuyInfoListResultDTO>> getGroupBuyList(@LoginUser TokenDto tokenDto, EpdcSelectGroupBuyInfoListFormDTO formDTO) {
-	    if(StringUtils.isBlank(tokenDto.getUserId())){
-	        return new Result<List<EpdcSelectGroupBuyInfoListResultDTO>>().error("无效的token");
-        }
-        formDTO.setUserId(tokenDto.getUserId());
+    public Result<List<EpdcSelectGroupBuyInfoListResultDTO>> getGroupBuyList(EpdcSelectGroupBuyInfoListFormDTO formDTO) {
         return customFeignClient.getGroupBuyList(formDTO);
     }
 
     @Override
-    public Result<EpdcSelectGroupBuyDetailResultDTO> getGroupBuyDetail(String id) {
-        return customFeignClient.getGroupBuyDetail(id);
+    public Result<EpdcSelectGroupBuyDetailResultDTO> getGroupBuyDetail(TokenDto tokenDto,EpdcSelectGroupBuyDetailFormDTO epdcSelectGroupBuyDetailFormDTO) {
+        if(StringUtils.isBlank(tokenDto.getUserId())){
+            return new Result<EpdcSelectGroupBuyDetailResultDTO>().error("无效的token");
+        }
+        epdcSelectGroupBuyDetailFormDTO.setUserId(tokenDto.getUserId());
+        return customFeignClient.getGroupBuyDetail(epdcSelectGroupBuyDetailFormDTO);
     }
 
     @Override
@@ -291,4 +290,57 @@ public class CustomServiceImpl implements CustomService {
     public Result callSdsMobile(String id) {
         return customFeignClient.callSdsMobile(id);
     }
+
+    @Override
+    public Result tradeConfirmation(EpdcTradeConfirmationFormDTO formDTO) {
+        return customFeignClient.tradeConfirmation(formDTO);
+    }
+
+    @Override
+    public Result signUpOrCancel(TokenDto tokenDto, EpdcSignUpOrCancelFormDTO formDTO) {
+        if(StringUtils.isBlank(tokenDto.getUserId())){
+            return new Result<List<EpdcSelectGroupBuyInfoListResultDTO>>().error("无效的token");
+        }
+        formDTO.setFaceImg(tokenDto.getFaceImg());
+        formDTO.setMobile(tokenDto.getMobile());
+        formDTO.setNickname(tokenDto.getNickname());
+        formDTO.setRealName(tokenDto.getRealName());
+        formDTO.setUserId(tokenDto.getUserId());
+        return customFeignClient.signUpOrCancel(formDTO);
+    }
+
+    @Override
+    public Result<List<EpdcSelectMyGroupBuyJoinInfoListResultDTO>> getMyGroupBuyJoin(EpdcSelectMyGroupBuyJoinInfoListFormDTO formDTO) {
+        return customFeignClient.getMyGroupBuyJoin(formDTO);
+    }
+
+    @Override
+    public Result<List<EpdcSelectMyGroupBuyPublishInfoListResultDTO>> getMyGroupBuyPublish(EpdcSelectMyGroupBuyPublishInfoListFormDTO formDTO) {
+        return customFeignClient.getMyGroupBuyPublish(formDTO);
+    }
+
+    @Override
+    public Result<List<EpdcSelectSignUpInfoListResultDTO>> getGroupBuySignUpList(EpdcSelectSignUpInfoListFormDTO formDTO) {
+        return customFeignClient.getGroupBuySignUpList(formDTO);
+    }
+
+    @Override
+    public Result updateStatus(EpdcUpdateStatusFormDTO formDTO) {
+        return customFeignClient.updateStatus(formDTO);
+    }
+
+    @Override
+    public Result evaluation(TokenDto tokenDto, EpdcEvaluationGroupBuyFormDTO formDTO) {
+        if(StringUtils.isBlank(tokenDto.getUserId())){
+            return new Result<List<EpdcSelectGroupBuyInfoListResultDTO>>().error("无效的token");
+        }
+        formDTO.setFaceImg(tokenDto.getFaceImg());
+        formDTO.setNickname(tokenDto.getNickname());
+        formDTO.setUserId(tokenDto.getUserId());
+        return customFeignClient.evaluation(formDTO);    }
+
+    @Override
+    public Result<List<EpdcSelectEvaluationListResultDTO>> getEvaluationList(EpdcSelectEvaluationListFormDTO formDTO) {
+        return customFeignClient.getEvaluationList(formDTO);
+	}
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/constant/CustomImageConstant.java

@@ -12,4 +12,12 @@ public interface CustomImageConstant {
      * 一键服务-锦水清风-举报问题
      */
     String IMAGE_TYPE_YJFW_JSQF_JBWT = "yjfw_jsqf_jbwt";
+    /**
+     * 志愿者服务-拼团购-发布
+     */
+    String IMAGE_TYPE_GROUP_BUY = "group_buy";
+    /**
+     * 志愿者服务-拼团购-评价
+     */
+    String IMAGE_TYPE_GROUP_BUY_EVALUATION = "group_buy_evaluation";
 }

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

@@ -63,6 +63,24 @@ public class GroupBuyEvaluationDTO implements Serializable {
      * 评价内容
      */
 	private String evaluationContent;
+    /**
+     * 屏蔽标识
+     */
+    private String shieldFlag;
+    /**
+     * 屏蔽人ID
+     */
+    private String shieldUserId;
+
+    /**
+     * 屏蔽人姓名
+     */
+    private String shieldUserName;
+
+    /**
+     * 屏蔽原因
+     */
+    private String shieldReason;
 
     /**
      * 删除标识

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

@@ -174,7 +174,7 @@ public class GroupBuyInfoDTO implements Serializable {
     /**
      * 置顶时间
      */
-    private Integer topTime;
+    private Date topTime;
 
     /**
      * 置顶人ID
@@ -184,7 +184,7 @@ public class GroupBuyInfoDTO implements Serializable {
     /**
      * 状态0：进行中 1：已取消 2：已结束
      */
-    private String groupBuyStatus;
+    private Integer groupBuyStatus;
 
     /**
      * 取消原因

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

@@ -17,9 +17,10 @@
 
 package com.elink.esua.epdc.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -72,7 +73,10 @@ public class GroupBuySignUpDTO implements Serializable {
      * 报名状态 0：已报名1：已交易2：已取消
      */
 	private Integer signUpStatus;
-
+    /**
+     * 报名时间
+     */
+    private Date signUpTime;
     /**
      * 删除标识
      */

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

@@ -17,13 +17,14 @@
 
 package com.elink.esua.epdc.dto.form;
 
+import com.elink.esua.epdc.dto.GroupBuyPriceNumberDTO;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
-import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -62,11 +63,18 @@ public class EpdcAddGroupBuyInfoFormDTO implements Serializable {
     @NotBlank(message = "发布内容不能为空")
     @Size(min = 1,max = 500,message = "发布内容在500字以内")
     private String groupBuyContent;
+
     /**
-     * 团购时间
+     * 团购价格人数（最多五条）
      */
-    @NotNull(message = "团购时间不能为空")
-    private Date groupBuyTime;
+    @NotNull(message = "团购价格人数不能为空")
+    List<GroupBuyPriceNumberDTO> groupBuyPriceNumber;
+
+    /**
+     * 团购图片（最多三张）
+     */
+    List<String> groupBuyImg;
+
 
     /**
      * 发布人姓名

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

@@ -0,0 +1,72 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 拼团购 评价
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-12-02
+ */
+@Data
+public class EpdcEvaluationGroupBuyFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String groupBuyId;
+
+    /**
+     * 评价内容
+     */
+    @NotBlank(message = "评价内容不能为空")
+    @Size(min = 1,max = 50,message = "评价内容在50字以内")
+    private String evaluationContent;
+
+    /**
+     * 团购图片（最多三张）
+     */
+    List<String> evaluationImg;
+
+    /**
+     * 评价人ID
+     */
+    private String userId;
+
+    /**
+     * 评价人昵称
+     */
+    private String nickname;
+
+    /**
+     * 头像
+     */
+    private String faceImg;
+
+
+}

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

@@ -0,0 +1,57 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 拼团购 评价列表 表单dto
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-12-02
+ */
+@Data
+public class EpdcSelectEvaluationListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 页码
+     */
+    @Min(value = 1, message = "页码必须大于0")
+    private Integer pageIndex;
+
+    /**
+     * 页容量
+     */
+    @Min(value = 1, message = "页容量必须大于0")
+    private Integer pageSize;
+
+    /**
+     * 拼团购ID
+     */
+    @NotBlank(message = "拼团购ID不能为空")
+    private String groupBuyId;
+
+}

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

@@ -0,0 +1,47 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 拼团购 详情表单
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-12-02
+ */
+@Data
+public class EpdcSelectGroupBuyDetailFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+
+}

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

@@ -20,7 +20,6 @@ package com.elink.esua.epdc.dto.form;
 import lombok.Data;
 
 import javax.validation.constraints.Min;
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 
@@ -48,10 +47,4 @@ public class EpdcSelectGroupBuyInfoListFormDTO implements Serializable {
     @Min(value = 1, message = "页容量必须大于0")
     private Integer pageSize;
 
-
-    @NotBlank(message = "是否为我发布不能为空")
-    private String isMe;
-
-
-    private String userId;
 }

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

@@ -0,0 +1,55 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import java.io.Serializable;
+
+
+/**
+ * 拼团购 我的参与 表单dto
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-12-02
+ */
+@Data
+public class EpdcSelectMyGroupBuyJoinInfoListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 页码
+     */
+    @Min(value = 1, message = "页码必须大于0")
+    private Integer pageIndex;
+
+    /**
+     * 页容量
+     */
+    @Min(value = 1, message = "页容量必须大于0")
+    private Integer pageSize;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+}

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

@@ -0,0 +1,55 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import java.io.Serializable;
+
+
+/**
+ * 拼团购 我的发布 表单dto
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-12-02
+ */
+@Data
+public class EpdcSelectMyGroupBuyPublishInfoListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 页码
+     */
+    @Min(value = 1, message = "页码必须大于0")
+    private Integer pageIndex;
+
+    /**
+     * 页容量
+     */
+    @Min(value = 1, message = "页容量必须大于0")
+    private Integer pageSize;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+}

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

@@ -0,0 +1,57 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.Min;
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+
+/**
+ * 拼团购 交易确认列表 表单dto
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-12-02
+ */
+@Data
+public class EpdcSelectSignUpInfoListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 页码
+     */
+    @Min(value = 1, message = "页码必须大于0")
+    private Integer pageIndex;
+
+    /**
+     * 页容量
+     */
+    @Min(value = 1, message = "页容量必须大于0")
+    private Integer pageSize;
+
+    /**
+     * 拼团购ID
+     */
+    @NotBlank(message = "拼团购ID不能为空")
+    private String id;
+
+}

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

@@ -0,0 +1,76 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+
+/**
+ * 拼团购 报名/取消报名
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-12-02
+ */
+@Data
+public class EpdcSignUpOrCancelFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 拼团购ID
+     */
+    @NotBlank(message ="拼团购ID不能为空")
+    private String id;
+    /**
+     * 状态
+     */
+    @NotNull(message ="报名状态不能为空")
+    private Integer status;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 用户姓名
+     */
+    private String realName;
+
+
+    /**
+     * 用户昵称
+     */
+    private String nickname;
+
+    /**
+     * 头像
+     */
+    private String faceImg;
+
+    /**
+     * 用户电话
+     */
+    private String mobile;
+
+    
+}

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

@@ -0,0 +1,44 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 拼团购 交易确认 表单dto
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-12-02
+ */
+@Data
+public class EpdcTradeConfirmationFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 交易列表
+     */
+    @NotNull(message ="交易确认列表不能为空")
+    List<TradeConfirmation> tradeConfirmationList;
+
+}

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

@@ -0,0 +1,54 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+
+/**
+ * 拼团购 我的发布取消/结束
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-12-02
+ */
+@Data
+public class EpdcUpdateStatusFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 拼团购ID
+     */
+    @NotBlank(message ="拼团购ID不能为空")
+    private String id;
+    /**
+     * 状态
+     */
+    @NotNull(message ="报名状态不能为空")
+    private Integer status;
+
+    /**
+     * 取消原因
+     */
+    private String cancelReason;
+
+}

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

@@ -0,0 +1,49 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.form;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 拼团购 交易确认
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-12-02
+ */
+@Data
+public class TradeConfirmation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 交易状态0：未交易5：已交易
+     */
+    private String id;
+
+
+    /**
+     * 主键
+     */
+    private Integer signUpStatus;
+
+
+
+}

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectEvaluationListResultDTO.java

@@ -0,0 +1,58 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 拼团购 评价列表 结果dto
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-12-02
+ */
+@Data
+public class EpdcSelectEvaluationListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 评价内容
+     */
+    private String evaluationContent;
+    /**
+     * 昵称
+     */
+    private String nickname;
+    /**
+     * 图片
+     */
+    private List<String> evaluationImg;
+    /**
+     * 头像
+     */
+    private String faceImg;
+    /**
+     * 评价时间
+     */
+    private String evaluationTime;
+
+}

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectGroupBuyDetailResultDTO.java

@@ -17,10 +17,12 @@
 
 package com.elink.esua.epdc.dto.result;
 
+import com.elink.esua.epdc.dto.GroupBuyPriceNumberDTO;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -59,4 +61,32 @@ public class EpdcSelectGroupBuyDetailResultDTO implements Serializable {
      */
     private Date groupBuyTime;
 
+    /**
+     * 报名人数
+     */
+    private Integer groupBuyNumber;
+
+    /**
+     * 团购图片
+     */
+    private List<String> groupBuyImg;
+
+    /**
+     * 报名状态
+     */
+    private Integer signUpStatus;
+    /**
+     * 取消原因
+     */
+    private String cancelReason;
+
+    /**
+     * 状态
+     */
+    private Integer groupBuyStatus;
+    /**
+     * 人数价格
+     */
+    private List<GroupBuyPriceNumberDTO> groupBuyPriceNumber;
+
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectGroupBuyInfoListResultDTO.java

@@ -21,6 +21,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -46,19 +47,23 @@ public class EpdcSelectGroupBuyInfoListResultDTO implements Serializable {
     private String groupBuyTitle;
 
     /**
-     * 联系电话
+     * 团购状态
      */
-    private String groupBuyMobile;
+    private Integer groupBuyStatus;
 
     /**
-     * 发布内容
+     * 团购图片
      */
-    private String groupBuyContent;
+    private List<String> groupBuyImg;
 
     /**
-     * 团购时间
+     * 发布时间
      */
-    private Date groupBuyTime;
+    private Date groupBuyPublishTime;
+    /**
+     * 是否置顶
+     */
+    private String topFlag;
 
 
 

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectMyGroupBuyJoinInfoListResultDTO.java

@@ -0,0 +1,68 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 拼团购 我的参与 结果dto
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-12-02
+ */
+@Data
+public class EpdcSelectMyGroupBuyJoinInfoListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键
+     */
+    private String id;
+
+
+    /**
+     * 标题
+     */
+    private String groupBuyTitle;
+
+    /**
+     * 是否评价
+     */
+    private String isEvaluation;
+
+    /**
+     * 团购状态
+     */
+    private Integer groupBuyStatus;
+
+    /**
+     * 发布时间
+     */
+    private String groupBuyPublishTime;
+    /**
+     * 图片
+     */
+    private List<String> groupBuyImg;
+
+}

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectMyGroupBuyPublishInfoListResultDTO.java

@@ -0,0 +1,69 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+
+/**
+ * 拼团购 我的发布 结果dto
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-12-02
+ */
+@Data
+public class EpdcSelectMyGroupBuyPublishInfoListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 主键
+     */
+    private String id;
+
+
+    /**
+     * 标题
+     */
+    private String groupBuyTitle;
+
+    /**
+     * 团购状态
+     */
+    private Integer groupBuyStatus;
+
+    /**
+     * 发布时间
+     */
+    private String groupBuyPublishTime;
+
+    /**
+     * 是否可以修改
+     */
+    private String isEdit;
+    /**
+     * 图片
+     */
+    private List<String> groupBuyImg;
+
+
+}

esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectSignUpInfoListResultDTO.java

@@ -0,0 +1,57 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.elink.esua.epdc.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 拼团购 交易确认列表 结果dto
+ *
+ * @author qu qu@elink-cn.com
+ * @since v1.0.0 2020-12-02
+ */
+@Data
+public class EpdcSelectSignUpInfoListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 拼团购ID
+     */
+    private String id;
+    /**
+     * 昵称
+     */
+    private String nickname;
+    /**
+     * 状态
+     */
+    private Integer signUpStatus;
+    /**
+     * 头像
+     */
+    private String faceImg;
+    /**
+     * 电话
+     */
+    private String mobile;
+
+}

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/controller/EpdcAppGroupBuyInfoController.java

@@ -20,11 +20,11 @@ package com.elink.esua.epdc.modules.groupbuy.controller;
 import com.elink.esua.epdc.commons.tools.constant.Constant;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
-import com.elink.esua.epdc.dto.form.EpdcAddGroupBuyInfoFormDTO;
-import com.elink.esua.epdc.dto.form.EpdcSelectGroupBuyInfoListFormDTO;
-import com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyDetailResultDTO;
-import com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO;
+import com.elink.esua.epdc.dto.form.*;
+import com.elink.esua.epdc.dto.result.*;
+import com.elink.esua.epdc.modules.groupbuy.service.GroupBuyEvaluationService;
 import com.elink.esua.epdc.modules.groupbuy.service.GroupBuyInfoService;
+import com.elink.esua.epdc.modules.groupbuy.service.GroupBuySignUpService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -44,6 +44,11 @@ public class EpdcAppGroupBuyInfoController {
     @Autowired
     private GroupBuyInfoService groupBuyInfoService;
 
+    @Autowired
+    private GroupBuySignUpService groupBuySignUpService;
+
+    @Autowired
+    private GroupBuyEvaluationService groupBuyEvaluationService;
 
     /**
      * @Description  获取首页列表
@@ -58,6 +63,31 @@ public class EpdcAppGroupBuyInfoController {
         return groupBuyInfoService.getGroupBuyList(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("getMyGroupBuyJoin")
+    public Result<List<EpdcSelectMyGroupBuyJoinInfoListResultDTO>> getMyGroupBuyJoin(@RequestBody EpdcSelectMyGroupBuyJoinInfoListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return groupBuyInfoService.getMyGroupBuyJoin(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("getMyGroupBuyPublish")
+    public Result<List<EpdcSelectMyGroupBuyPublishInfoListResultDTO>> getMyGroupBuyPublish(@RequestBody EpdcSelectMyGroupBuyPublishInfoListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return groupBuyInfoService.getMyGroupBuyPublish(formDTO);
+    }
+
     /**
      * @Description  详情
      * @Author songyunpeng
@@ -65,9 +95,9 @@ public class EpdcAppGroupBuyInfoController {
      * @Param [id]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyDetailResultDTO>
      **/
-    @GetMapping("getGroupBuyDetail/{id}")
-    public Result<EpdcSelectGroupBuyDetailResultDTO> getGroupBuyDetail(@PathVariable String id) {
-        return groupBuyInfoService.getGroupBuyDetail(id);
+    @GetMapping("getGroupBuyDetail")
+    public Result<EpdcSelectGroupBuyDetailResultDTO> getGroupBuyDetail(@RequestBody  EpdcSelectGroupBuyDetailFormDTO epdcSelectGroupBuyDetailFormDTO) {
+        return groupBuyInfoService.getGroupBuyDetail(epdcSelectGroupBuyDetailFormDTO);
     }
 
     /**
@@ -94,6 +124,7 @@ public class EpdcAppGroupBuyInfoController {
     public Result deleteGroupBuy(@PathVariable String id) {
         return groupBuyInfoService.deleteGroupBuy(id);
     }
+
     /**
      * @Description  打电话计算次数
      * @Author songyunpeng
@@ -105,4 +136,79 @@ public class EpdcAppGroupBuyInfoController {
     public Result callMobile(@PathVariable String id) {
         return groupBuyInfoService.callMobile(id);
     }
+    /**
+     * @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>>
+     **/
+    @PostMapping("signUpOrCancel")
+    public Result signUpOrCancel(@RequestBody EpdcSignUpOrCancelFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return groupBuySignUpService.signUpOrCancel(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("getGroupBuySignUpList")
+    public Result<List<EpdcSelectSignUpInfoListResultDTO>> getGroupBuySignUpList(@RequestBody EpdcSelectSignUpInfoListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return groupBuyInfoService.getGroupBuySignUpList(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>>
+     **/
+    @PostMapping("tradeConfirmation")
+    public Result tradeConfirmation(@RequestBody EpdcTradeConfirmationFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return groupBuySignUpService.tradeConfirmation(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>>
+     **/
+    @PostMapping("evaluation")
+    public Result evaluation(@RequestBody EpdcEvaluationGroupBuyFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return groupBuyEvaluationService.evaluation(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("getEvaluationList")
+    public Result<List<EpdcSelectEvaluationListResultDTO>> getEvaluationList(@RequestBody EpdcSelectEvaluationListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return groupBuyEvaluationService.getEvaluationList(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>>
+     **/
+    @PostMapping("updateStatus")
+    public Result updateStatus(@RequestBody EpdcUpdateStatusFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return groupBuyInfoService.updateStatus(formDTO);
+    }
+
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/dao/GroupBuyEvaluationDao.java

@@ -18,9 +18,13 @@
 package com.elink.esua.epdc.modules.groupbuy.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.form.EpdcSelectEvaluationListFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcSelectEvaluationListResultDTO;
 import com.elink.esua.epdc.modules.groupbuy.entity.GroupBuyEvaluationEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  *  
  *
@@ -29,5 +33,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface GroupBuyEvaluationDao extends BaseDao<GroupBuyEvaluationEntity> {
-	
+    /**
+     * @Description  获取评价列表
+     * @Author songyunpeng
+     * @Date  2020/12/24
+     * @Param [formDTO]
+     * @return java.util.List<com.elink.esua.epdc.dto.result.EpdcSelectEvaluationListResultDTO>
+     **/
+    List<EpdcSelectEvaluationListResultDTO> getEvaluationList(EpdcSelectEvaluationListFormDTO formDTO);
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/dao/GroupBuyInfoDao.java

@@ -19,9 +19,8 @@ package com.elink.esua.epdc.modules.groupbuy.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.GroupBuyInfoDTO;
-import com.elink.esua.epdc.dto.form.EpdcSelectGroupBuyInfoListFormDTO;
-import com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyDetailResultDTO;
-import com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO;
+import com.elink.esua.epdc.dto.form.*;
+import com.elink.esua.epdc.dto.result.*;
 import com.elink.esua.epdc.modules.groupbuy.entity.GroupBuyInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -50,7 +49,7 @@ public interface GroupBuyInfoDao extends BaseDao<GroupBuyInfoEntity> {
      * @Param [id]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyDetailResultDTO>
      **/
-    EpdcSelectGroupBuyDetailResultDTO getGroupBuyDetail(String id);
+    EpdcSelectGroupBuyDetailResultDTO getGroupBuyDetail(EpdcSelectGroupBuyDetailFormDTO epdcSelectGroupBuyDetailFormDTO);
     /**
      * @Description  查询需要修改组织机构信息事件
      * @Author songyunpeng
@@ -67,4 +66,28 @@ public interface GroupBuyInfoDao extends BaseDao<GroupBuyInfoEntity> {
      * @return void
      **/
     void updateGridByDeptId(String newDeptName, Long deptId);
+    /**
+     * @Description  我的参与
+     * @Author songyunpeng
+     * @Date  2020/12/23
+     * @Param [formDTO]
+     * @return java.util.List<com.elink.esua.epdc.dto.result.EpdcSelectMyGroupBuyJoinInfoListResultDTO>
+     **/
+    List<EpdcSelectMyGroupBuyJoinInfoListResultDTO> getMyGroupBuyJoin(EpdcSelectMyGroupBuyJoinInfoListFormDTO formDTO);
+    /**
+     * @Description  我的发布
+     * @Author songyunpeng
+     * @Date  2020/12/23
+     * @Param [formDTO]
+     * @return java.util.List<com.elink.esua.epdc.dto.result.EpdcSelectMyGroupBuyJoinInfoListResultDTO>
+     **/
+    List<EpdcSelectMyGroupBuyPublishInfoListResultDTO> getMyGroupBuyPublish(EpdcSelectMyGroupBuyPublishInfoListFormDTO formDTO);
+    /**
+     * @Description  获取交易列表
+     * @Author songyunpeng
+     * @Date  2020/12/23
+     * @Param [formDTO]
+     * @return java.util.List<com.elink.esua.epdc.dto.result.EpdcSelectSignUpInfoListResultDTO>
+     **/
+    List<EpdcSelectSignUpInfoListResultDTO> getGroupBuySignUpList(EpdcSelectSignUpInfoListFormDTO formDTO);
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/dao/GroupBuyPriceNumberDao.java

@@ -29,5 +29,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface GroupBuyPriceNumberDao extends BaseDao<GroupBuyPriceNumberEntity> {
-	
+    /**
+     * @Description  删除关联信息
+     * @Author songyunpeng
+     * @Date  2020/12/23
+     * @Param [id]
+     * @return void
+     **/
+    void deleteByGroupBuyId(String id);
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/entity/GroupBuyEvaluationEntity.java

@@ -18,13 +18,10 @@
 package com.elink.esua.epdc.modules.groupbuy.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  *  
  *
@@ -62,5 +59,24 @@ public class GroupBuyEvaluationEntity extends BaseEpdcEntity {
      * 评价内容
      */
 	private String evaluationContent;
+    /**
+     * 屏蔽标识
+     */
+    private String shieldFlag;
+    /**
+     * 屏蔽人ID
+     */
+    private String shieldUserId;
+
+    /**
+     * 屏蔽人姓名
+     */
+    private String shieldUserName;
+
+    /**
+     * 屏蔽原因
+     */
+    private String shieldReason;
+
 
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/entity/GroupBuyInfoEntity.java

@@ -22,6 +22,8 @@ import com.elink.esua.epdc.commons.mybatis.entity.BaseEpdcEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * 拼团购 
  *
@@ -141,7 +143,7 @@ public class GroupBuyInfoEntity extends BaseEpdcEntity {
     /**
      * 置顶时间
      */
-    private Integer topTime;
+    private Date topTime;
 
     /**
      * 置顶人ID
@@ -151,7 +153,7 @@ public class GroupBuyInfoEntity extends BaseEpdcEntity {
     /**
      * 状态0：进行中 1：已取消 2：已结束
      */
-    private String groupBuyStatus;
+    private Integer groupBuyStatus;
 
     /**
      * 取消原因

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/entity/GroupBuySignUpEntity.java

@@ -72,5 +72,9 @@ public class GroupBuySignUpEntity extends BaseEpdcEntity {
      * 报名状态 0：已报名1：已交易2：已取消
      */
 	private Integer signUpStatus;
+    /**
+     * 报名时间
+     */
+	private Date signUpTime;
 
 }

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

@@ -19,7 +19,11 @@ package com.elink.esua.epdc.modules.groupbuy.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.GroupBuyEvaluationDTO;
+import com.elink.esua.epdc.dto.form.EpdcEvaluationGroupBuyFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcSelectEvaluationListFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcSelectEvaluationListResultDTO;
 import com.elink.esua.epdc.modules.groupbuy.entity.GroupBuyEvaluationEntity;
 
 import java.util.List;
@@ -92,4 +96,20 @@ public interface GroupBuyEvaluationService extends BaseService<GroupBuyEvaluatio
      * @date 2020-12-23
      */
     void delete(String[] ids);
+    /**
+     * @Description  评价 
+     * @Author songyunpeng
+     * @Date  2020/12/24
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    Result evaluation(EpdcEvaluationGroupBuyFormDTO formDTO);
+    /**
+     * @Description  获取评价列表 
+     * @Author songyunpeng
+     * @Date  2020/12/24
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcSelectEvaluationListResultDTO>>
+     **/
+    Result<List<EpdcSelectEvaluationListResultDTO>> getEvaluationList(EpdcSelectEvaluationListFormDTO formDTO);
 }

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

@@ -21,11 +21,8 @@ import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.GroupBuyInfoDTO;
-import com.elink.esua.epdc.dto.form.EpdcAddGroupBuyInfoFormDTO;
-import com.elink.esua.epdc.dto.form.EpdcSelectGroupBuyInfoListFormDTO;
-import com.elink.esua.epdc.dto.form.SdsPtgShieldFormDTO;
-import com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyDetailResultDTO;
-import com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO;
+import com.elink.esua.epdc.dto.form.*;
+import com.elink.esua.epdc.dto.result.*;
 import com.elink.esua.epdc.modules.groupbuy.entity.GroupBuyInfoEntity;
 import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO;
@@ -115,7 +112,7 @@ public interface GroupBuyInfoService extends BaseService<GroupBuyInfoEntity> {
      * @Param [id]
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyDetailResultDTO>
      **/
-    Result<EpdcSelectGroupBuyDetailResultDTO> getGroupBuyDetail(String id);
+    Result<EpdcSelectGroupBuyDetailResultDTO> getGroupBuyDetail(EpdcSelectGroupBuyDetailFormDTO epdcSelectGroupBuyDetailFormDTO);
     /**
      * @Description  发布或更新
      * @Author songyunpeng
@@ -164,4 +161,36 @@ public interface GroupBuyInfoService extends BaseService<GroupBuyInfoEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      **/
     Result modifyGroupBuyShieldFlag(SdsPtgShieldFormDTO formDto);
+    /**
+     * @Description  我的参与 
+     * @Author songyunpeng
+     * @Date  2020/12/23
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcSelectMyGroupBuyJoinInfoListResultDTO>>
+     **/
+    Result<List<EpdcSelectMyGroupBuyJoinInfoListResultDTO>> getMyGroupBuyJoin(EpdcSelectMyGroupBuyJoinInfoListFormDTO formDTO);
+    /**
+     * @Description  我的发布 
+     * @Author songyunpeng
+     * @Date  2020/12/23
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcSelectMyGroupBuyPublishInfoListResultDTO>>
+     **/
+    Result<List<EpdcSelectMyGroupBuyPublishInfoListResultDTO>> getMyGroupBuyPublish(EpdcSelectMyGroupBuyPublishInfoListFormDTO formDTO);
+    /**
+     * @Description  获取交易列表 
+     * @Author songyunpeng
+     * @Date  2020/12/23
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcSelectSignUpInfoListResultDTO>>
+     **/
+    Result<List<EpdcSelectSignUpInfoListResultDTO>> getGroupBuySignUpList(EpdcSelectSignUpInfoListFormDTO formDTO);
+    /**
+     * @Description  我的发布取消/结束 
+     * @Author songyunpeng
+     * @Date  2020/12/24
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    Result updateStatus(EpdcUpdateStatusFormDTO formDTO);
 }

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

@@ -19,7 +19,10 @@ package com.elink.esua.epdc.modules.groupbuy.service;
 
 import com.elink.esua.epdc.commons.mybatis.service.BaseService;
 import com.elink.esua.epdc.commons.tools.page.PageData;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.GroupBuySignUpDTO;
+import com.elink.esua.epdc.dto.form.EpdcSignUpOrCancelFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcTradeConfirmationFormDTO;
 import com.elink.esua.epdc.modules.groupbuy.entity.GroupBuySignUpEntity;
 
 import java.util.List;
@@ -92,4 +95,21 @@ public interface GroupBuySignUpService extends BaseService<GroupBuySignUpEntity>
      * @date 2020-12-23
      */
     void delete(String[] ids);
+    /**
+     * @Description  交易确认
+     * @Author songyunpeng
+     * @Date  2020/12/23
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    Result tradeConfirmation(EpdcTradeConfirmationFormDTO formDTO);
+    /**
+     * @Description  报名/取消报名 
+     * @Author songyunpeng
+     * @Date  2020/12/24
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     **/
+    Result signUpOrCancel(EpdcSignUpOrCancelFormDTO formDTO);
+
 }

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

@@ -21,13 +21,20 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.constant.NumConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.constant.CustomImageConstant;
 import com.elink.esua.epdc.dto.GroupBuyEvaluationDTO;
+import com.elink.esua.epdc.dto.form.EpdcEvaluationGroupBuyFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcSelectEvaluationListFormDTO;
+import com.elink.esua.epdc.dto.result.EpdcSelectEvaluationListResultDTO;
 import com.elink.esua.epdc.modules.groupbuy.dao.GroupBuyEvaluationDao;
 import com.elink.esua.epdc.modules.groupbuy.entity.GroupBuyEvaluationEntity;
-import com.elink.esua.epdc.modules.groupbuy.redis.GroupBuyEvaluationRedis;
 import com.elink.esua.epdc.modules.groupbuy.service.GroupBuyEvaluationService;
+import com.elink.esua.epdc.modules.reportissue.entity.CustomImgEntity;
+import com.elink.esua.epdc.modules.reportissue.service.CustomImgService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -47,7 +54,8 @@ import java.util.Map;
 public class GroupBuyEvaluationServiceImpl extends BaseServiceImpl<GroupBuyEvaluationDao, GroupBuyEvaluationEntity> implements GroupBuyEvaluationService {
 
     @Autowired
-    private GroupBuyEvaluationRedis groupBuyEvaluationRedis;
+    private CustomImgService customImgService;
+
 
     @Override
     public PageData<GroupBuyEvaluationDTO> page(Map<String, Object> params) {
@@ -101,4 +109,29 @@ public class GroupBuyEvaluationServiceImpl extends BaseServiceImpl<GroupBuyEvalu
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public Result evaluation(EpdcEvaluationGroupBuyFormDTO formDTO) {
+        GroupBuyEvaluationEntity groupBuyEvaluationEntity = ConvertUtils.sourceToTarget(formDTO,GroupBuyEvaluationEntity.class);
+        insert(groupBuyEvaluationEntity);
+        if(formDTO.getEvaluationImg()!=null && formDTO.getEvaluationImg().size()>0){
+            formDTO.getEvaluationImg().forEach(evaluationImg -> {
+                CustomImgEntity customImgEntity= ConvertUtils.sourceToTarget(evaluationImg,CustomImgEntity.class);
+                customImgEntity.setReferenceId(groupBuyEvaluationEntity.getGroupBuyId());
+                customImgEntity.setImgUrl(evaluationImg);
+                customImgEntity.setImgType(CustomImageConstant.IMAGE_TYPE_GROUP_BUY_EVALUATION);
+                customImgService.insert(customImgEntity);
+            });
+        }
+        return null;
+    }
+
+    @Override
+    public Result<List<EpdcSelectEvaluationListResultDTO>> getEvaluationList(EpdcSelectEvaluationListFormDTO formDTO) {
+        int pageIndex = (formDTO.getPageIndex() - NumConstant.ONE) * formDTO.getPageSize();
+        formDTO.setPageIndex(pageIndex);
+
+        List<EpdcSelectEvaluationListResultDTO> list = this.baseDao.getEvaluationList(formDTO);
+        return new Result().ok(list);
+    }
+
 }

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

@@ -32,20 +32,22 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResult
 import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.constant.CustomImageConstant;
 import com.elink.esua.epdc.constant.SdsPtgNoticeConstant;
 import com.elink.esua.epdc.dto.GroupBuyInfoDTO;
+import com.elink.esua.epdc.dto.GroupBuyPriceNumberDTO;
 import com.elink.esua.epdc.dto.epdc.form.EpdcInformationFormDTO;
-import com.elink.esua.epdc.dto.form.EpdcAddGroupBuyInfoFormDTO;
-import com.elink.esua.epdc.dto.form.EpdcSelectGroupBuyInfoListFormDTO;
-import com.elink.esua.epdc.dto.form.SdsPtgShieldFormDTO;
-import com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyDetailResultDTO;
-import com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO;
+import com.elink.esua.epdc.dto.form.*;
+import com.elink.esua.epdc.dto.result.*;
 import com.elink.esua.epdc.modules.feign.AdminFeignClient;
 import com.elink.esua.epdc.modules.feign.ContentSecurityFeignClient;
 import com.elink.esua.epdc.modules.groupbuy.dao.GroupBuyInfoDao;
+import com.elink.esua.epdc.modules.groupbuy.dao.GroupBuyPriceNumberDao;
 import com.elink.esua.epdc.modules.groupbuy.entity.GroupBuyInfoEntity;
-import com.elink.esua.epdc.modules.groupbuy.redis.GroupBuyInfoRedis;
+import com.elink.esua.epdc.modules.groupbuy.entity.GroupBuyPriceNumberEntity;
 import com.elink.esua.epdc.modules.groupbuy.service.GroupBuyInfoService;
+import com.elink.esua.epdc.modules.reportissue.dao.CustomImgDao;
+import com.elink.esua.epdc.modules.reportissue.entity.CustomImgEntity;
 import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO;
 import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO;
 import org.apache.commons.lang3.StringUtils;
@@ -53,7 +55,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 拼团购 
@@ -64,9 +69,6 @@ import java.util.*;
 @Service
 public class GroupBuyInfoServiceImpl extends BaseServiceImpl<GroupBuyInfoDao, GroupBuyInfoEntity> implements GroupBuyInfoService {
 
-    @Autowired
-    private GroupBuyInfoRedis groupBuyInfoRedis;
-
     @Autowired
     private NewsTask newsTask;
 
@@ -77,6 +79,12 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl<GroupBuyInfoDao, Gr
     @Autowired
     private ContentSecurityFeignClient contentSecurityFeign;
 
+    @Autowired
+    private GroupBuyPriceNumberDao groupBuyPriceNumberDao;
+
+    @Autowired
+    private CustomImgDao customImgDao;
+
     @Override
     public PageData<GroupBuyInfoDTO> page(Map<String, Object> params) {
         IPage<GroupBuyInfoEntity> page = baseDao.selectPage(
@@ -157,12 +165,12 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl<GroupBuyInfoDao, Gr
     }
 
     @Override
-    public Result<EpdcSelectGroupBuyDetailResultDTO> getGroupBuyDetail(String id) {
+    public Result<EpdcSelectGroupBuyDetailResultDTO> getGroupBuyDetail(EpdcSelectGroupBuyDetailFormDTO epdcSelectGroupBuyDetailFormDTO) {
         //查看详情 新增浏览次数
-        GroupBuyInfoEntity groupBuyInfoEntity = selectById(id);
+        GroupBuyInfoEntity groupBuyInfoEntity = selectById(epdcSelectGroupBuyDetailFormDTO.getId());
         groupBuyInfoEntity.setBrowseNum(groupBuyInfoEntity.getBrowseNum()==null?1:groupBuyInfoEntity.getBrowseNum()+1);
         updateById(groupBuyInfoEntity);
-        return new Result<EpdcSelectGroupBuyDetailResultDTO>().ok(this.baseDao.getGroupBuyDetail(id));
+        return new Result<EpdcSelectGroupBuyDetailResultDTO>().ok(this.baseDao.getGroupBuyDetail(epdcSelectGroupBuyDetailFormDTO));
     }
 
     @Override
@@ -186,9 +194,6 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl<GroupBuyInfoDao, Gr
         }
         //内容审核 - end
 
-        if(formDTO.getGroupBuyTime().before(new Date())){
-            return new Result().error("团购时间不能小于当前时间");
-        }
         GroupBuyInfoEntity groupBuyInfoEntity = ConvertUtils.sourceToTarget(formDTO,GroupBuyInfoEntity.class);
         if(StringUtils.isNotBlank(formDTO.getId())){
             updateById(groupBuyInfoEntity);
@@ -196,6 +201,19 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl<GroupBuyInfoDao, Gr
             //新增
             insert(groupBuyInfoEntity);
         }
+        if(formDTO.getGroupBuyPriceNumber().size()==0){
+            return new Result().error("人数价格信息至少填写一条");
+        }
+        if(formDTO.getGroupBuyPriceNumber().size()>5){
+            return new Result().error("人数价格信息最多填写五条");
+        }
+        if(formDTO.getGroupBuyImg()!=null && formDTO.getGroupBuyImg().size()>3){
+            return new Result().error("图片最多上传三张");
+        }
+        //插入或更新后插入价格人数和图片表
+        insertPriceNumAndImgs(groupBuyInfoEntity.getId(),formDTO.getGroupBuyImg(),formDTO.getGroupBuyPriceNumber());
+
+
         //内容审核 - start
         //接口异常，保存至待审核信息
         if((contentResult == null) && !isConReview) {
@@ -224,6 +242,35 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl<GroupBuyInfoDao, Gr
         //内容审核 - end
         return new Result();
     }
+    /**
+     * @Description  插入图片和人数价格信息
+     * @Author songyunpeng
+     * @Date  2020/12/23
+     * @Param [id, groupBuyImg, groupBuyPriceNumber]
+     * @return void
+     **/
+    private void insertPriceNumAndImgs(String id, List<String> groupBuyImg, List<GroupBuyPriceNumberDTO> groupBuyPriceNumber) {
+        //删除价格信息数据
+        groupBuyPriceNumberDao.deleteByGroupBuyId(id);
+        //新增价格信息数据
+        groupBuyPriceNumber.forEach(groupBuyPriceNumberDTO -> {
+            GroupBuyPriceNumberEntity groupBuyPriceNumberEntity = ConvertUtils.sourceToTarget(groupBuyPriceNumberDTO,GroupBuyPriceNumberEntity.class);
+            groupBuyPriceNumberEntity.setGroupBuyId(id);
+            groupBuyPriceNumberDao.insert(groupBuyPriceNumberEntity);
+        });
+        if(groupBuyImg!=null && groupBuyImg.size()>0){
+            //删除图片信息
+            customImgDao.deleteByGroupBuyId(id);
+            //新增图片信息
+            groupBuyImg.forEach(groupBuyImgDto -> {
+                CustomImgEntity customImgEntity= ConvertUtils.sourceToTarget(groupBuyImgDto,CustomImgEntity.class);
+                customImgEntity.setReferenceId(id);
+                customImgEntity.setImgUrl(groupBuyImgDto);
+                customImgEntity.setImgType(CustomImageConstant.IMAGE_TYPE_GROUP_BUY);
+                customImgDao.insert(customImgEntity);
+            });
+        }
+    }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -282,6 +329,48 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl<GroupBuyInfoDao, Gr
         return new Result();
     }
 
+    @Override
+    public Result<List<EpdcSelectMyGroupBuyJoinInfoListResultDTO>> getMyGroupBuyJoin(EpdcSelectMyGroupBuyJoinInfoListFormDTO formDTO) {
+        int pageIndex = (formDTO.getPageIndex() - NumConstant.ONE) * formDTO.getPageSize();
+        formDTO.setPageIndex(pageIndex);
+
+        List<EpdcSelectMyGroupBuyJoinInfoListResultDTO> list = this.baseDao.getMyGroupBuyJoin(formDTO);
+        return new Result().ok(list);
+    }
+
+    @Override
+    public Result<List<EpdcSelectMyGroupBuyPublishInfoListResultDTO>> getMyGroupBuyPublish(EpdcSelectMyGroupBuyPublishInfoListFormDTO formDTO) {
+        int pageIndex = (formDTO.getPageIndex() - NumConstant.ONE) * formDTO.getPageSize();
+        formDTO.setPageIndex(pageIndex);
+
+        List<EpdcSelectMyGroupBuyPublishInfoListResultDTO> list = this.baseDao.getMyGroupBuyPublish(formDTO);
+        return new Result().ok(list);
+    }
+
+    @Override
+    public Result<List<EpdcSelectSignUpInfoListResultDTO>> getGroupBuySignUpList(EpdcSelectSignUpInfoListFormDTO formDTO) {
+        int pageIndex = (formDTO.getPageIndex() - NumConstant.ONE) * formDTO.getPageSize();
+        formDTO.setPageIndex(pageIndex);
+
+        List<EpdcSelectSignUpInfoListResultDTO> list = this.baseDao.getGroupBuySignUpList(formDTO);
+        return new Result().ok(list);
+    }
+
+    @Override
+    public Result updateStatus(EpdcUpdateStatusFormDTO formDTO) {
+        GroupBuyInfoEntity groupBuyInfoEntity = new GroupBuyInfoEntity();
+        groupBuyInfoEntity.setId(formDTO.getId());
+        groupBuyInfoEntity.setGroupBuyStatus(formDTO.getStatus());
+        if(10 == formDTO.getStatus()){
+            if(StringUtils.isBlank(formDTO.getCancelReason())){
+                return new Result().error("请填写取消原因");
+            }
+            groupBuyInfoEntity.setCancelReason(formDTO.getCancelReason());
+        }
+        updateById(groupBuyInfoEntity);
+        return new Result();
+    }
+
     @Override
     public void rejectActInfo(RejectRecordDTO dto) {
         baseDao.deleteById(dto.getRelationId());

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

@@ -23,7 +23,10 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.GroupBuySignUpDTO;
+import com.elink.esua.epdc.dto.form.EpdcSignUpOrCancelFormDTO;
+import com.elink.esua.epdc.dto.form.EpdcTradeConfirmationFormDTO;
 import com.elink.esua.epdc.modules.groupbuy.dao.GroupBuySignUpDao;
 import com.elink.esua.epdc.modules.groupbuy.entity.GroupBuySignUpEntity;
 import com.elink.esua.epdc.modules.groupbuy.redis.GroupBuySignUpRedis;
@@ -33,12 +36,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
- * 拼团购报名表 
+ * 拼团购报名表
  *
  * @author qu qu@elink-cn.com
  * @since v1.0.0 2020-12-23
@@ -65,8 +66,8 @@ public class GroupBuySignUpServiceImpl extends BaseServiceImpl<GroupBuySignUpDao
         return ConvertUtils.sourceToTarget(entityList, GroupBuySignUpDTO.class);
     }
 
-    private QueryWrapper<GroupBuySignUpEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<GroupBuySignUpEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<GroupBuySignUpEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -101,4 +102,52 @@ public class GroupBuySignUpServiceImpl extends BaseServiceImpl<GroupBuySignUpDao
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public Result tradeConfirmation(EpdcTradeConfirmationFormDTO formDTO) {
+        if (formDTO.getTradeConfirmationList().size() == 0) {
+            return new Result().error("交易确认列表参数不能为空");
+        }
+        formDTO.getTradeConfirmationList().forEach(tradeConfirmation -> {
+            GroupBuySignUpEntity groupBuySignUpEntity = new GroupBuySignUpEntity();
+            groupBuySignUpEntity.setId(tradeConfirmation.getId());
+            groupBuySignUpEntity.setSignUpStatus(tradeConfirmation.getSignUpStatus());
+            updateById(groupBuySignUpEntity);
+        });
+        return new Result();
+    }
+
+    @Override
+    public Result signUpOrCancel(EpdcSignUpOrCancelFormDTO formDTO) {
+        Map<String,Object> params = new HashMap<>();
+        params.put("GROUP_BUY_ID",formDTO.getId());
+        params.put("USER_ID",formDTO.getUserId());
+        List<GroupBuySignUpEntity> groupBuySignUpEntities = baseDao.selectByMap(params);
+        if(10 == formDTO.getStatus()){
+            if(groupBuySignUpEntities==null || groupBuySignUpEntities.size()==0){
+                return new Result().error("未查询到报名信息");
+            }
+            if(10 == groupBuySignUpEntities.get(0).getSignUpStatus()){
+                return new Result().error("报名已取消,请勿重复点击");
+            }
+            GroupBuySignUpEntity groupBuySignUpEntity = groupBuySignUpEntities.get(0);
+            groupBuySignUpEntity.setSignUpStatus(10);
+            updateById(groupBuySignUpEntity);
+        } else if(0 == formDTO.getStatus()){
+            if(groupBuySignUpEntities!=null && groupBuySignUpEntities.size()>0){
+                GroupBuySignUpEntity groupBuySignUpEntity = groupBuySignUpEntities.get(0);
+                if(10 != groupBuySignUpEntity.getSignUpStatus()){
+                    return new Result().error("用户已报名或已交易确认，请勿重复点击");
+                }else if(10 == groupBuySignUpEntity.getSignUpStatus()){
+                    groupBuySignUpEntity.setSignUpStatus(0);
+                    groupBuySignUpEntity.setSignUpTime(new Date());
+                    updateById(groupBuySignUpEntity);
+                }
+            }else {
+                GroupBuySignUpEntity groupBuySignUpEntity = ConvertUtils.sourceToTarget(formDTO,GroupBuySignUpEntity.class);
+                insert(groupBuySignUpEntity);
+            }
+        }
+        return new Result();
+    }
+
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/reportissue/dao/CustomImgDao.java

@@ -29,5 +29,12 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface CustomImgDao extends BaseDao<CustomImgEntity> {
-	
+    /**
+     * @Description  删除图片
+     * @Author songyunpeng
+     * @Date  2020/12/23
+     * @Param [id]
+     * @return void
+     **/
+    void deleteByGroupBuyId(String id);
 }

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

@@ -17,6 +17,29 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <resultMap id="getEvaluationListMap"
+               type="com.elink.esua.epdc.dto.result.EpdcSelectEvaluationListResultDTO">
+        <result property="faceImg" column="FACE_IMG"/>
+        <result property="nickname" column="NICKNAME"/>
+        <result property="evaluationContent" column="EVALUATION_CONTENT"/>
+        <result property="evaluationTime" column="CREATED_TIME"/>
+        <collection property="evaluationImg" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
+    </resultMap>
+    <select id="getEvaluationList"
+            resultMap="getEvaluationListMap">
+        select
+           t.FACE_IMG,
+           t.NICKNAME,
+           t.EVALUATION_CONTENT,
+           t.CREATED_TIME,
+           t1.IMG_URL
+        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'
+    </select>
 
 
 </mapper>

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

@@ -32,29 +32,80 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <resultMap id="getGroupBuyListMap" type="com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO">
+        <result property="id" column="ID"/>
+        <result property="groupBuyTitle" column="GROUP_BUY_TITLE"/>
+        <result property="groupBuyStatus" column="GROUP_BUY_STATUS"/>
+        <result property="groupBuyPublishTime" column="groupBuyPublishTime"/>
+        <result property="topFlag" column="TOP_FLAG"/>
+        <collection property="groupBuyImg" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
+    </resultMap>
     <select id="getGroupBuyList"
-            resultType="com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO">
-        select
-           t.ID,
-           t.GROUP_BUY_TITLE,
-           t.GROUP_BUY_MOBILE,
-           t.GROUP_BUY_CONTENT
+            resultMap="getGroupBuyListMap">
+        select t.ID,
+               t.GROUP_BUY_TITLE,
+               t.GROUP_BUY_STATUS,
+               t.CREATED_TIME as groupBuyPublishTime,
+               t.TOP_FLAG,
+               t1.IMG_URL
         from epdc_group_buy_info t
-        where t.DEL_FLAG = '0' and t.SHIELD_FLAG = '0'
-        <if test="isMe != '' and isMe != null and isMe == 1">
-            and t.USER_ID = #{userId}
-        </if>
-        order by sort,CREATED_TIME desc
+        left join
+             (select * from epdc_custom_img order by IMG_URL)t1 on t.ID = t1.REFERENCE_ID and t1.IMG_TYPE = 'group_buy' and t1.DEL_FLAG = '0'
+        where t.DEL_FLAG = '0'
+          and t.SHIELD_FLAG = '0'
+          and t.GROUP_BUY_STATUS != '10'
+        order by t.TOP_FLAG desc,t.TOP_TIME desc, t.GROUP_BUY_STATUS, t.CREATED_TIME desc
         LIMIT #{pageIndex},#{pageSize}
     </select>
+    <resultMap id="getGroupBuyDetailMap" type="com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyDetailResultDTO">
+        <result property="id" column="ID"/>
+        <result property="groupBuyTitle" column="GROUP_BUY_TITLE"/>
+        <result property="groupBuyMobile" column="GROUP_BUY_MOBILE"/>
+        <result property="groupBuyContent" column="GROUP_BUY_CONTENT"/>
+        <result property="groupBuyNumber" column="groupBuyNumber"/>
+        <result property="signUpStatus" column="signUpStatus"/>
+        <result property="cancelReason" column="CANCEL_REASON"/>
+        <result property="groupBuyStatus" column="GROUP_BUY_STATUS"/>
+        <collection property="groupBuyImg" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
+        <collection property="groupBuyPriceNumber" ofType="com.elink.esua.epdc.dto.GroupBuyPriceNumberDTO">
+            <result property="groupBuyNumber" column="GROUP_BUY_NUMBER"/>
+            <result property="groupBuyPrice" column="GROUP_BUY_PRICE"/>
+        </collection>
+    </resultMap>
     <select id="getGroupBuyDetail"
-            resultType="com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyDetailResultDTO">
-        select
-        ID,
-        GROUP_BUY_TITLE,
-        GROUP_BUY_MOBILE,
-        GROUP_BUY_CONTENT
+            resultMap="getGroupBuyDetailMap">
+        select t.ID,
+               GROUP_BUY_TITLE,
+               GROUP_BUY_MOBILE,
+               GROUP_BUY_CONTENT,
+               (select count(1)
+                from epdc_group_buy_sign_up egbsu
+                where egbsu.GROUP_BUY_ID = t.ID
+                  and egbsu.DEL_FLAG = '0'
+                  and egbsu.SIGN_UP_STATUS != 10)            groupBuyNumber,
+               t1.IMG_URL,
+               ifnull((select if(SIGN_UP_STATUS = 0, 1, 2)
+                       from epdc_group_buy_sign_up egbsu
+                       where egbsu.GROUP_BUY_ID = t.ID
+                         and egbsu.USER_ID = #{userId}
+                         and egbsu.DEL_FLAG = '0'
+                         and egbsu.SIGN_UP_STATUS != 10), 0) signUpStatus,
+               t.CANCEL_REASON,
+               t.GROUP_BUY_STATUS,
+               t2.GROUP_BUY_NUMBER,
+               t2.GROUP_BUY_PRICE,
+               t1.IMG_URL
         from epdc_group_buy_info 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' and t1.DEL_FLAG = '0'
+         left join
+         (select * from epdc_group_buy_price_number order by GROUP_BUY_NUMBER) t2
+         on t.ID = t2.GROUP_BUY_ID and t2.DEL_FLAG = '0'
         where t.DEL_FLAG = '0' and t.SHIELD_FLAG = '0'
         and t.ID = #{id}
     </select>
@@ -70,6 +121,84 @@
         WHERE
             FIND_IN_SET( #{deptId}, ALL_DEPT_IDS )
     </select>
+    <resultMap id="getMyGroupBuyJoinMap"
+               type="com.elink.esua.epdc.dto.result.EpdcSelectMyGroupBuyJoinInfoListResultDTO">
+        <result property="id" column="ID"/>
+        <result property="groupBuyTitle" column="GROUP_BUY_TITLE"/>
+        <result property="groupBuyStatus" column="GROUP_BUY_STATUS"/>
+        <result property="groupBuyPublishTime" column="groupBuyPublishTime"/>
+        <result property="isEvaluation" column="isEvaluation"/>
+        <collection property="groupBuyImg" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
+    </resultMap>
+    <select id="getMyGroupBuyJoin"
+            resultMap="getMyGroupBuyJoinMap">
+        select t.ID,
+           t.GROUP_BUY_TITLE,
+           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
+        from epdc_group_buy_info 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' and t1.DEL_FLAG = '0'
+        left join epdc_group_buy_sign_up t2 on t2.GROUP_BUY_ID = t.ID and t2.DEL_FLAG= '0'
+        where t.DEL_FLAG = '0'
+          and t.SHIELD_FLAG = '0'
+          and t.GROUP_BUY_STATUS != '10'
+          and t2.USER_ID = #{userId}
+        order by t.GROUP_BUY_STATUS, t.CREATED_TIME desc
+        LIMIT #{pageIndex},#{pageSize}
+    </select>
+    <resultMap id="getMyGroupBuyPublishMap"
+               type="com.elink.esua.epdc.dto.result.EpdcSelectMyGroupBuyPublishInfoListResultDTO">
+        <result property="id" column="ID"/>
+        <result property="groupBuyTitle" column="GROUP_BUY_TITLE"/>
+        <result property="groupBuyStatus" column="GROUP_BUY_STATUS"/>
+        <result property="groupBuyPublishTime" column="groupBuyPublishTime"/>
+        <result property="isEdit" column="isEdit"/>
+        <collection property="groupBuyImg" ofType="java.lang.String">
+            <result property="image" column="IMG_URL"/>
+        </collection>
+    </resultMap>
+    <select id="getMyGroupBuyPublish"
+            resultMap="getMyGroupBuyPublishMap">
+        select t.ID,
+           t.GROUP_BUY_TITLE,
+           t.GROUP_BUY_STATUS,
+           t.CREATED_TIME as groupBuyPublishTime,
+           t1.IMG_URL,
+        if(t.GROUP_BUY_STATUS = 10 or t.GROUP_BUY_STATUS = 5 or t2.ID is not null,0,1)isEdit
+        from epdc_group_buy_info 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' and t1.DEL_FLAG = '0'
+             left join
+             (select * from epdc_group_buy_sign_up where DEL_FLAG = '0' group by GROUP_BUY_ID)t2
+              on t.ID = t2.GROUP_BUY_ID
+        where t.DEL_FLAG = '0'
+          and t.SHIELD_FLAG = '0'
+          and t.GROUP_BUY_STATUS != '10'
+          and t.USER_ID = #{userId}
+        order by t.GROUP_BUY_STATUS, t.CREATED_TIME desc
+        LIMIT #{pageIndex},#{pageSize}
+    </select>
+    <select id="getGroupBuySignUpList"
+            resultType="com.elink.esua.epdc.dto.result.EpdcSelectSignUpInfoListResultDTO">
+        select
+           ID,
+           MOBILE,
+           FACE_IMG,
+           NICKNAME,
+           SIGN_UP_STATUS
+        from epdc_group_buy_sign_up
+        where DEL_FLAG ='0' and SIGN_UP_STATUS != 10
+        order by CREATED_TIME desc
+        LIMIT #{pageIndex},#{pageSize}
+    </select>
 
     <update id="updateGridByDeptId">
         UPDATE epdc_group_buy_info SET GRID = #{newDeptName}, UPDATED_TIME = NOW() WHERE GRID_ID = #{deptId}

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

@@ -15,6 +15,9 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <delete id="deleteByGroupBuyId">
+        delete from epdc_group_buy_price_number where GROUP_BUY_ID = #{id}
+    </delete>
 
 
 </mapper>

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/reportissue/CustomImgDao.xml

@@ -15,6 +15,9 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <delete id="deleteByGroupBuyId">
+        delete from epdc_custom_img where REFERENCE_ID = #{id}
+    </delete>
 
 
 </mapper>