From a0b0f04d97f04b963de9478ceceaa857f248f53a Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Thu, 24 Dec 2020 14:31:07 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E8=B4=AD=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ApiCustomInfoController.java | 77 +++- .../esua/epdc/feign/CustomFeignClient.java | 75 +++- .../fallback/CustomFeignClientFallback.java | 44 ++- .../esua/epdc/service/CustomService.java | 354 +++++++++++------- .../epdc/service/impl/CustomServiceImpl.java | 68 +++- .../epdc/constant/CustomImageConstant.java | 8 + .../esua/epdc/dto/GroupBuyEvaluationDTO.java | 18 + .../elink/esua/epdc/dto/GroupBuyInfoDTO.java | 4 +- .../esua/epdc/dto/GroupBuySignUpDTO.java | 8 +- .../dto/form/EpdcAddGroupBuyInfoFormDTO.java | 16 +- .../form/EpdcEvaluationGroupBuyFormDTO.java | 72 ++++ .../form/EpdcSelectEvaluationListFormDTO.java | 57 +++ .../form/EpdcSelectGroupBuyDetailFormDTO.java | 47 +++ .../EpdcSelectGroupBuyInfoListFormDTO.java | 7 - ...dcSelectMyGroupBuyJoinInfoListFormDTO.java | 55 +++ ...electMyGroupBuyPublishInfoListFormDTO.java | 55 +++ .../form/EpdcSelectSignUpInfoListFormDTO.java | 57 +++ .../dto/form/EpdcSignUpOrCancelFormDTO.java | 76 ++++ .../form/EpdcTradeConfirmationFormDTO.java | 44 +++ .../dto/form/EpdcUpdateStatusFormDTO.java | 54 +++ .../esua/epdc/dto/form/TradeConfirmation.java | 49 +++ .../EpdcSelectEvaluationListResultDTO.java | 58 +++ .../EpdcSelectGroupBuyDetailResultDTO.java | 30 ++ .../EpdcSelectGroupBuyInfoListResultDTO.java | 17 +- ...SelectMyGroupBuyJoinInfoListResultDTO.java | 68 ++++ ...ectMyGroupBuyPublishInfoListResultDTO.java | 69 ++++ .../EpdcSelectSignUpInfoListResultDTO.java | 57 +++ .../EpdcAppGroupBuyInfoController.java | 120 +++++- .../groupbuy/dao/GroupBuyEvaluationDao.java | 13 +- .../modules/groupbuy/dao/GroupBuyInfoDao.java | 31 +- .../groupbuy/dao/GroupBuyPriceNumberDao.java | 9 +- .../entity/GroupBuyEvaluationEntity.java | 22 +- .../groupbuy/entity/GroupBuyInfoEntity.java | 6 +- .../groupbuy/entity/GroupBuySignUpEntity.java | 4 + .../service/GroupBuyEvaluationService.java | 20 + .../groupbuy/service/GroupBuyInfoService.java | 41 +- .../service/GroupBuySignUpService.java | 20 + .../impl/GroupBuyEvaluationServiceImpl.java | 37 +- .../service/impl/GroupBuyInfoServiceImpl.java | 121 +++++- .../impl/GroupBuySignUpServiceImpl.java | 61 ++- .../modules/reportissue/dao/CustomImgDao.java | 9 +- .../mapper/groupBuy/GroupBuyEvaluationDao.xml | 23 ++ .../mapper/groupBuy/GroupBuyInfoDao.xml | 163 +++++++- .../groupBuy/GroupBuyPriceNumberDao.xml | 3 + .../mapper/reportissue/CustomImgDao.xml | 3 + 45 files changed, 2013 insertions(+), 237 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcEvaluationGroupBuyFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSelectEvaluationListFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSelectGroupBuyDetailFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSelectMyGroupBuyJoinInfoListFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSelectMyGroupBuyPublishInfoListFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSelectSignUpInfoListFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSignUpOrCancelFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcTradeConfirmationFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcUpdateStatusFormDTO.java create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/TradeConfirmation.java create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectEvaluationListResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectMyGroupBuyJoinInfoListResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectMyGroupBuyPublishInfoListResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectSignUpInfoListResultDTO.java diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java index b4faa09f..9fbdeec4 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/controller/ApiCustomInfoController.java +++ b/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> **/ @GetMapping("groupBuy/getGroupBuyList") - public Result> getGroupBuyList( @LoginUser TokenDto tokenDto, EpdcSelectGroupBuyInfoListFormDTO formDTO) { + public Result> 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 **/ @GetMapping("groupBuy/getGroupBuyDetail/{id}") - public Result getGroupBuyDetail(@PathVariable String id) { - return customService.getGroupBuyDetail(id); + public Result 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> + **/ + @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> + **/ + @GetMapping("groupBuy/getGroupBuySignUpList") + public Result> 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> + **/ + @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> + **/ + @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> + **/ + @GetMapping("groupBuy/getEvaluationList") + public Result> 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> + **/ + @PostMapping("groupBuy/updateStatus") + public Result updateStatus(@RequestBody EpdcUpdateStatusFormDTO formDTO) { + return customService.updateStatus(formDTO); + } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java index bfa16f81..a97930ef 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/CustomFeignClient.java +++ b/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> getGroupBuyList(@RequestBody EpdcSelectGroupBuyInfoListFormDTO formDTO); - + /** + * @Description 我的参与 + * @Author songyunpeng + * @Date 2020/12/2 + * @Param [formDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @GetMapping(value = "custom/epdc-app/groupBuy/getMyGroupBuyJoin", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> getMyGroupBuyJoin(@RequestBody EpdcSelectMyGroupBuyJoinInfoListFormDTO formDTO); + /** + * @Description 我的发布 + * @Author songyunpeng + * @Date 2020/12/2 + * @Param [formDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @GetMapping(value = "custom/epdc-app/groupBuy/getMyGroupBuyPublish", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> getMyGroupBuyPublish(@RequestBody EpdcSelectMyGroupBuyPublishInfoListFormDTO formDTO); /** * @Description 详情 * @Author songyunpeng @@ -179,7 +196,7 @@ public interface CustomFeignClient { * @return com.elink.esua.epdc.commons.tools.utils.Result **/ @GetMapping(value = "custom/epdc-app/groupBuy/getGroupBuyDetail/{id}", consumes = MediaType.APPLICATION_JSON_VALUE) - Result getGroupBuyDetail(@PathVariable String id); + Result 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> + **/ + @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> + **/ + @GetMapping(value = "custom/epdc-app/groupBuy/getGroupBuySignUpList", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> getGroupBuySignUpList(@RequestBody EpdcSelectSignUpInfoListFormDTO formDTO); + /** + * @Description 交易确认 + * @Author songyunpeng + * @Date 2020/12/2 + * @Param [formDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @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> + **/ + @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> + **/ + @GetMapping(value = "custom/epdc-app/groupBuy/getEvaluationList", consumes = MediaType.APPLICATION_JSON_VALUE) + Result> getEvaluationList(@RequestBody EpdcSelectEvaluationListFormDTO formDTO); + /** + * @Description 我的发布取消/结束 + * @Author songyunpeng + * @Date 2020/12/2 + * @Param [formDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @GetMapping(value = "custom/epdc-app/groupBuy/updateStatus", consumes = MediaType.APPLICATION_JSON_VALUE) + Result updateStatus(@RequestBody EpdcUpdateStatusFormDTO formDTO); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java index 113a2257..5c882ff6 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/CustomFeignClientFallback.java +++ b/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 getGroupBuyDetail(String id) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getGroupBuyDetail", id); + public Result> getMyGroupBuyJoin(EpdcSelectMyGroupBuyJoinInfoListFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getMyGroupBuyJoin", formDTO); + } + + @Override + public Result> getMyGroupBuyPublish(EpdcSelectMyGroupBuyPublishInfoListFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getMyGroupBuyPublish", formDTO); + } + + @Override + public Result 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> 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> 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> getSdsList(EpdcSelectSdsInfoListFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.EPDC_CUSTOM_SERVER, "getSdsList", formDTO); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java index f1f88650..cbe20d99 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/CustomService.java +++ b/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 - * @Author yinzuomei - * @Description 获取所有组织机构信息 - * @Date 2020/1/28 12:14 - **/ - Result 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> - * @Author zhangyong - * @Date 10:42 2020-05-20 - **/ - @Deprecated - Result> listModule(); - - /** - * - * 根据模块分类获取模块 - * - * @params [moduleCategory] - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @author liuchuang - * @since 2020/7/15 17:44 - */ - Result> listOfModuleByModuleCategory(String moduleCategory); - - /** - * 移动端获取 了解锦水-硬核管理接口 + /** + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Author yinzuomei + * @Description 获取所有组织机构信息 + * @Date 2020/1/28 12:14 + **/ + Result 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> - * @Author zhangyong - * @Date 13:41 2020-05-20 - **/ - Result> listDeptInfo(EpdcDeptInfoFormDTO formDTO); + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 10:42 2020-05-20 + **/ + @Deprecated + Result> listModule(); /** - * @Description 获取有档案的归属部门列表 + * 根据模块分类获取模块 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @params [moduleCategory] + * @author liuchuang + * @since 2020/7/15 17:44 + */ + Result> listOfModuleByModuleCategory(String moduleCategory); + + /** + * 移动端获取 了解锦水-硬核管理接口 + * + * @param formDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 13:41 2020-05-20 + **/ + Result> listDeptInfo(EpdcDeptInfoFormDTO formDTO); + + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Description 获取有档案的归属部门列表 * @Author songyunpeng - * @Date 2020/7/7 + * @Date 2020/7/7 * @Param [formDTO] - * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ Result> listArchiveDeptInfo(ArchiveDeptFormDTO formDTO); + /** - * @Description 获取档案列表 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Description 获取档案列表 * @Author songyunpeng - * @Date 2020/7/7 + * @Date 2020/7/7 * @Param [formDTO] - * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ Result> listArchivesInfo(ArchiveFormDTO formDTO); + /** - * @Description 获取档案详情 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 获取档案详情 * @Author songyunpeng - * @Date 2020/7/7 + * @Date 2020/7/7 * @Param [id] - * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result getArchiveDetail(String id); /** - * @Description 特殊人群分析-人群分布接口 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 特殊人群分析-人群分布接口 * @Author songyunpeng - * @Date 2020/11/4 + * @Date 2020/11/4 * @Param [] - * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result selectPopulationDistribution(); + /** - * @Description 特殊人群分析-查人接口 + * @param specialUserFormDTO + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Description 特殊人群分析-查人接口 * @Author songyunpeng - * @Date 2020/11/4 + * @Date 2020/11/4 * @Param [] - * @return com.elink.esua.epdc.commons.tools.utils.Result> - * @param specialUserFormDTO*/ + */ Result> selectPageSpecialUser(SpecialUserFormDTO specialUserFormDTO); + /** - * @Description 特殊人群分析-详情接口 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 特殊人群分析-详情接口 * @Author songyunpeng - * @Date 2020/11/4 + * @Date 2020/11/4 * @Param [suId] - * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result selectSpecialUserDetail(String suId); + /** - * @Description 特殊人群分析-残疾类别分布接口 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 特殊人群分析-残疾类别分布接口 * @Author songyunpeng - * @Date 2020/11/4 + * @Date 2020/11/4 * @Param [specialUserDisabilityTypeFormDTO] - * @return com.elink.esua.epdc.commons.tools.utils.Result **/ Result> selectDisabilityType(SpecialUserDisabilityTypeFormDTO specialUserDisabilityTypeFormDTO); + /** - * @Description 特殊人群分析-月度补贴情况接口 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Description 特殊人群分析-月度补贴情况接口 * @Author songyunpeng - * @Date 2020/11/4 + * @Date 2020/11/4 * @Param [dto] - * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ Result> 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> - * @author Liuchuang - * @since 2020/10/23 11:03 - */ - Result> listReportIssue(ReportIssueListFormDTO formDto, TokenDto tokenDto); - - /** - * 举报问题详情 - * - * @param id 记录ID - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author Liuchuang - * @since 2020/10/23 10:40 - */ - Result 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> + * @author Liuchuang + * @since 2020/10/23 11:03 + */ + Result> listReportIssue(ReportIssueListFormDTO formDto, TokenDto tokenDto); + + /** + * 举报问题详情 + * + * @param id 记录ID + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/10/23 10:40 + */ + Result getReportIssueById(String id); + + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Description 获取首页列表 + * @Author songyunpeng + * @Date 2020/12/2 * @Param [formDTO] - * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ - Result> getGroupBuyList(TokenDto tokenDto, EpdcSelectGroupBuyInfoListFormDTO formDTO); + Result> getGroupBuyList(EpdcSelectGroupBuyInfoListFormDTO 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 getGroupBuyDetail(String id); + Result getGroupBuyDetail(TokenDto tokenDto, EpdcSelectGroupBuyDetailFormDTO epdcSelectGroupBuyDetailFormDTO); + /** - * @Description 发布或更新 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @Description 发布或更新 * @Author songyunpeng - * @Date 2020/12/2 + * @Date 2020/12/2 * @Param [formDTO] - * @return com.elink.esua.epdc.commons.tools.utils.Result **/ - 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> + * @Description 小程序-获取首页列表 * @Author songyunpeng - * @Date 2020/12/3 + * @Date 2020/12/3 * @Param [formDTO] - * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ - Result> getSdsList(TokenDto tokenDto,EpdcSelectSdsInfoListFormDTO formDTO); + Result> getSdsList(TokenDto tokenDto, EpdcSelectSdsInfoListFormDTO 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 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> + * @Description 我的参与 + * @Author songyunpeng + * @Date 2020/12/23 + * @Param [formDTO] + **/ + Result> getMyGroupBuyJoin(EpdcSelectMyGroupBuyJoinInfoListFormDTO formDTO); + + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Description 我的发布 + * @Author songyunpeng + * @Date 2020/12/23 + * @Param [formDTO] + **/ + Result> getMyGroupBuyPublish(EpdcSelectMyGroupBuyPublishInfoListFormDTO formDTO); + + /** + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Description 获取交易列表 + * @Author songyunpeng + * @Date 2020/12/23 + * @Param [formDTO] + **/ + Result> 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> + * @Description 获取评价列表 + * @Author songyunpeng + * @Date 2020/12/24 + * @Param [formDTO] + **/ + Result> getEvaluationList(EpdcSelectEvaluationListFormDTO formDTO); } diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java index 5be721c7..06101193 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/CustomServiceImpl.java +++ b/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> getGroupBuyList(@LoginUser TokenDto tokenDto, EpdcSelectGroupBuyInfoListFormDTO formDTO) { - if(StringUtils.isBlank(tokenDto.getUserId())){ - return new Result>().error("无效的token"); - } - formDTO.setUserId(tokenDto.getUserId()); + public Result> getGroupBuyList(EpdcSelectGroupBuyInfoListFormDTO formDTO) { return customFeignClient.getGroupBuyList(formDTO); } @Override - public Result getGroupBuyDetail(String id) { - return customFeignClient.getGroupBuyDetail(id); + public Result getGroupBuyDetail(TokenDto tokenDto,EpdcSelectGroupBuyDetailFormDTO epdcSelectGroupBuyDetailFormDTO) { + if(StringUtils.isBlank(tokenDto.getUserId())){ + return new Result().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>().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> getMyGroupBuyJoin(EpdcSelectMyGroupBuyJoinInfoListFormDTO formDTO) { + return customFeignClient.getMyGroupBuyJoin(formDTO); + } + + @Override + public Result> getMyGroupBuyPublish(EpdcSelectMyGroupBuyPublishInfoListFormDTO formDTO) { + return customFeignClient.getMyGroupBuyPublish(formDTO); + } + + @Override + public Result> 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>().error("无效的token"); + } + formDTO.setFaceImg(tokenDto.getFaceImg()); + formDTO.setNickname(tokenDto.getNickname()); + formDTO.setUserId(tokenDto.getUserId()); + return customFeignClient.evaluation(formDTO); } + + @Override + public Result> getEvaluationList(EpdcSelectEvaluationListFormDTO formDTO) { + return customFeignClient.getEvaluationList(formDTO); + } } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/constant/CustomImageConstant.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/constant/CustomImageConstant.java index 11192027..c4e2c294 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/constant/CustomImageConstant.java +++ b/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"; } diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/GroupBuyEvaluationDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/GroupBuyEvaluationDTO.java index 74d2799b..f5bc01d4 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/GroupBuyEvaluationDTO.java +++ b/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; /** * 删除标识 diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/GroupBuyInfoDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/GroupBuyInfoDTO.java index 9fd3e99b..1edfbf4e 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/GroupBuyInfoDTO.java +++ b/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; /** * 取消原因 diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/GroupBuySignUpDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/GroupBuySignUpDTO.java index cc892542..867a5943 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/GroupBuySignUpDTO.java +++ b/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; /** * 删除标识 */ diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAddGroupBuyInfoFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAddGroupBuyInfoFormDTO.java index b50a3733..32af45cd 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcAddGroupBuyInfoFormDTO.java +++ b/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 groupBuyPriceNumber; + + /** + * 团购图片（最多三张） + */ + List groupBuyImg; + /** * 发布人姓名 diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcEvaluationGroupBuyFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcEvaluationGroupBuyFormDTO.java new file mode 100644 index 00000000..9494b698 --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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 evaluationImg; + + /** + * 评价人ID + */ + private String userId; + + /** + * 评价人昵称 + */ + private String nickname; + + /** + * 头像 + */ + private String faceImg; + + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSelectEvaluationListFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSelectEvaluationListFormDTO.java new file mode 100644 index 00000000..8f6a234b --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSelectGroupBuyDetailFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSelectGroupBuyDetailFormDTO.java new file mode 100644 index 00000000..4e7721de --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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; + + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSelectGroupBuyInfoListFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSelectGroupBuyInfoListFormDTO.java index 9e2a02d4..f29a67ad 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSelectGroupBuyInfoListFormDTO.java +++ b/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; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSelectMyGroupBuyJoinInfoListFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSelectMyGroupBuyJoinInfoListFormDTO.java new file mode 100644 index 00000000..eb296ef1 --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSelectMyGroupBuyPublishInfoListFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSelectMyGroupBuyPublishInfoListFormDTO.java new file mode 100644 index 00000000..a08cdff6 --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSelectSignUpInfoListFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSelectSignUpInfoListFormDTO.java new file mode 100644 index 00000000..12f7742d --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSignUpOrCancelFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcSignUpOrCancelFormDTO.java new file mode 100644 index 00000000..3ddbaa1c --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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; + + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcTradeConfirmationFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcTradeConfirmationFormDTO.java new file mode 100644 index 00000000..92ad0243 --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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 tradeConfirmationList; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcUpdateStatusFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/EpdcUpdateStatusFormDTO.java new file mode 100644 index 00000000..d128b142 --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/TradeConfirmation.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/TradeConfirmation.java new file mode 100644 index 00000000..0174d49b --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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; + + + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectEvaluationListResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectEvaluationListResultDTO.java new file mode 100644 index 00000000..fa672f51 --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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 evaluationImg; + /** + * 头像 + */ + private String faceImg; + /** + * 评价时间 + */ + private String evaluationTime; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectGroupBuyDetailResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectGroupBuyDetailResultDTO.java index 99ee0473..f2955cfc 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectGroupBuyDetailResultDTO.java +++ b/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 groupBuyImg; + + /** + * 报名状态 + */ + private Integer signUpStatus; + /** + * 取消原因 + */ + private String cancelReason; + + /** + * 状态 + */ + private Integer groupBuyStatus; + /** + * 人数价格 + */ + private List groupBuyPriceNumber; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectGroupBuyInfoListResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectGroupBuyInfoListResultDTO.java index 79d6ebbe..99eb0f01 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectGroupBuyInfoListResultDTO.java +++ b/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 groupBuyImg; /** - * 团购时间 + * 发布时间 */ - private Date groupBuyTime; + private Date groupBuyPublishTime; + /** + * 是否置顶 + */ + private String topFlag; diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectMyGroupBuyJoinInfoListResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectMyGroupBuyJoinInfoListResultDTO.java new file mode 100644 index 00000000..5c65483e --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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 groupBuyImg; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectMyGroupBuyPublishInfoListResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectMyGroupBuyPublishInfoListResultDTO.java new file mode 100644 index 00000000..a2b2b59a --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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 groupBuyImg; + + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectSignUpInfoListResultDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/result/EpdcSelectSignUpInfoListResultDTO.java new file mode 100644 index 00000000..5d665710 --- /dev/null +++ b/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 + *

+ * 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. + *

+ * 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. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +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; + +} \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/controller/EpdcAppGroupBuyInfoController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/controller/EpdcAppGroupBuyInfoController.java index ef880bbb..eb8c4bb3 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/controller/EpdcAppGroupBuyInfoController.java +++ b/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> + **/ + @GetMapping("getMyGroupBuyJoin") + public Result> 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> + **/ + @GetMapping("getMyGroupBuyPublish") + public Result> 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 **/ - @GetMapping("getGroupBuyDetail/{id}") - public Result getGroupBuyDetail(@PathVariable String id) { - return groupBuyInfoService.getGroupBuyDetail(id); + @GetMapping("getGroupBuyDetail") + public Result 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> + **/ + @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> + **/ + @GetMapping("getGroupBuySignUpList") + public Result> 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> + **/ + @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> + **/ + @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> + **/ + @GetMapping("getEvaluationList") + public Result> 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> + **/ + @PostMapping("updateStatus") + public Result updateStatus(@RequestBody EpdcUpdateStatusFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO); + return groupBuyInfoService.updateStatus(formDTO); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/dao/GroupBuyEvaluationDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/dao/GroupBuyEvaluationDao.java index 54f56543..8d35a261 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/dao/GroupBuyEvaluationDao.java +++ b/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 { - + /** + * @Description 获取评价列表 + * @Author songyunpeng + * @Date 2020/12/24 + * @Param [formDTO] + * @return java.util.List + **/ + List getEvaluationList(EpdcSelectEvaluationListFormDTO formDTO); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/dao/GroupBuyInfoDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/dao/GroupBuyInfoDao.java index c012c052..e7586187 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/dao/GroupBuyInfoDao.java +++ b/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 { * @Param [id] * @return com.elink.esua.epdc.commons.tools.utils.Result **/ - EpdcSelectGroupBuyDetailResultDTO getGroupBuyDetail(String id); + EpdcSelectGroupBuyDetailResultDTO getGroupBuyDetail(EpdcSelectGroupBuyDetailFormDTO epdcSelectGroupBuyDetailFormDTO); /** * @Description 查询需要修改组织机构信息事件 * @Author songyunpeng @@ -67,4 +66,28 @@ public interface GroupBuyInfoDao extends BaseDao { * @return void **/ void updateGridByDeptId(String newDeptName, Long deptId); + /** + * @Description 我的参与 + * @Author songyunpeng + * @Date 2020/12/23 + * @Param [formDTO] + * @return java.util.List + **/ + List getMyGroupBuyJoin(EpdcSelectMyGroupBuyJoinInfoListFormDTO formDTO); + /** + * @Description 我的发布 + * @Author songyunpeng + * @Date 2020/12/23 + * @Param [formDTO] + * @return java.util.List + **/ + List getMyGroupBuyPublish(EpdcSelectMyGroupBuyPublishInfoListFormDTO formDTO); + /** + * @Description 获取交易列表 + * @Author songyunpeng + * @Date 2020/12/23 + * @Param [formDTO] + * @return java.util.List + **/ + List getGroupBuySignUpList(EpdcSelectSignUpInfoListFormDTO formDTO); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/dao/GroupBuyPriceNumberDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/dao/GroupBuyPriceNumberDao.java index 557c55f3..7a337a95 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/dao/GroupBuyPriceNumberDao.java +++ b/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 { - + /** + * @Description 删除关联信息 + * @Author songyunpeng + * @Date 2020/12/23 + * @Param [id] + * @return void + **/ + void deleteByGroupBuyId(String id); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/entity/GroupBuyEvaluationEntity.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/entity/GroupBuyEvaluationEntity.java index 78f284c6..5b2c1098 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/entity/GroupBuyEvaluationEntity.java +++ b/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; + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/entity/GroupBuyInfoEntity.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/entity/GroupBuyInfoEntity.java index 2b5cdcb8..84035fff 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/entity/GroupBuyInfoEntity.java +++ b/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; /** * 取消原因 diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/entity/GroupBuySignUpEntity.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/entity/GroupBuySignUpEntity.java index c6e48efb..38c1cae7 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/entity/GroupBuySignUpEntity.java +++ b/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; } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/GroupBuyEvaluationService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/GroupBuyEvaluationService.java index 6705a22c..01627b4f 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/GroupBuyEvaluationService.java +++ b/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> + **/ + Result> getEvaluationList(EpdcSelectEvaluationListFormDTO formDTO); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/GroupBuyInfoService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/GroupBuyInfoService.java index bf0c5815..0055d3ad 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/GroupBuyInfoService.java +++ b/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 { * @Param [id] * @return com.elink.esua.epdc.commons.tools.utils.Result **/ - Result getGroupBuyDetail(String id); + Result getGroupBuyDetail(EpdcSelectGroupBuyDetailFormDTO epdcSelectGroupBuyDetailFormDTO); /** * @Description 发布或更新 * @Author songyunpeng @@ -164,4 +161,36 @@ public interface GroupBuyInfoService extends BaseService { * @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> + **/ + Result> getMyGroupBuyJoin(EpdcSelectMyGroupBuyJoinInfoListFormDTO formDTO); + /** + * @Description 我的发布 + * @Author songyunpeng + * @Date 2020/12/23 + * @Param [formDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + Result> getMyGroupBuyPublish(EpdcSelectMyGroupBuyPublishInfoListFormDTO formDTO); + /** + * @Description 获取交易列表 + * @Author songyunpeng + * @Date 2020/12/23 + * @Param [formDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + Result> 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); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/GroupBuySignUpService.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/GroupBuySignUpService.java index f8c28b48..c10e0f6b 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/GroupBuySignUpService.java +++ b/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 * @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); + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyEvaluationServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyEvaluationServiceImpl.java index bd93b950..5edff074 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyEvaluationServiceImpl.java +++ b/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 implements GroupBuyEvaluationService { @Autowired - private GroupBuyEvaluationRedis groupBuyEvaluationRedis; + private CustomImgService customImgService; + @Override public PageData page(Map params) { @@ -101,4 +109,29 @@ public class GroupBuyEvaluationServiceImpl extends BaseServiceImpl0){ + 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> getEvaluationList(EpdcSelectEvaluationListFormDTO formDTO) { + int pageIndex = (formDTO.getPageIndex() - NumConstant.ONE) * formDTO.getPageSize(); + formDTO.setPageIndex(pageIndex); + + List list = this.baseDao.getEvaluationList(formDTO); + return new Result().ok(list); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java index f0a2b32f..a57ce13e 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuyInfoServiceImpl.java +++ b/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 implements GroupBuyInfoService { - @Autowired - private GroupBuyInfoRedis groupBuyInfoRedis; - @Autowired private NewsTask newsTask; @@ -77,6 +79,12 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -157,12 +165,12 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl getGroupBuyDetail(String id) { + public Result 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().ok(this.baseDao.getGroupBuyDetail(id)); + return new Result().ok(this.baseDao.getGroupBuyDetail(epdcSelectGroupBuyDetailFormDTO)); } @Override @@ -186,9 +194,6 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl5){ + 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 groupBuyImg, List 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> getMyGroupBuyJoin(EpdcSelectMyGroupBuyJoinInfoListFormDTO formDTO) { + int pageIndex = (formDTO.getPageIndex() - NumConstant.ONE) * formDTO.getPageSize(); + formDTO.setPageIndex(pageIndex); + + List list = this.baseDao.getMyGroupBuyJoin(formDTO); + return new Result().ok(list); + } + + @Override + public Result> getMyGroupBuyPublish(EpdcSelectMyGroupBuyPublishInfoListFormDTO formDTO) { + int pageIndex = (formDTO.getPageIndex() - NumConstant.ONE) * formDTO.getPageSize(); + formDTO.setPageIndex(pageIndex); + + List list = this.baseDao.getMyGroupBuyPublish(formDTO); + return new Result().ok(list); + } + + @Override + public Result> getGroupBuySignUpList(EpdcSelectSignUpInfoListFormDTO formDTO) { + int pageIndex = (formDTO.getPageIndex() - NumConstant.ONE) * formDTO.getPageSize(); + formDTO.setPageIndex(pageIndex); + + List 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()); diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuySignUpServiceImpl.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuySignUpServiceImpl.java index 075e8bbe..39f8802a 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/service/impl/GroupBuySignUpServiceImpl.java +++ b/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 getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -101,4 +102,52 @@ public class GroupBuySignUpServiceImpl extends BaseServiceImpl { + GroupBuySignUpEntity groupBuySignUpEntity = new GroupBuySignUpEntity(); + groupBuySignUpEntity.setId(tradeConfirmation.getId()); + groupBuySignUpEntity.setSignUpStatus(tradeConfirmation.getSignUpStatus()); + updateById(groupBuySignUpEntity); + }); + return new Result(); + } + + @Override + public Result signUpOrCancel(EpdcSignUpOrCancelFormDTO formDTO) { + Map params = new HashMap<>(); + params.put("GROUP_BUY_ID",formDTO.getId()); + params.put("USER_ID",formDTO.getUserId()); + List 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(); + } + } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/reportissue/dao/CustomImgDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/reportissue/dao/CustomImgDao.java index 483e87df..973bb17c 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/reportissue/dao/CustomImgDao.java +++ b/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 { - + /** + * @Description 删除图片 + * @Author songyunpeng + * @Date 2020/12/23 + * @Param [id] + * @return void + **/ + void deleteByGroupBuyId(String id); } \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuyEvaluationDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuyEvaluationDao.xml index 81d40999..0dd259af 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuyEvaluationDao.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuyEvaluationDao.xml @@ -17,6 +17,29 @@ + + + + + + + + + + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuyInfoDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuyInfoDao.xml index 6e54475b..0c372a03 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuyInfoDao.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuyInfoDao.xml @@ -32,29 +32,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -70,6 +121,84 @@ WHERE FIND_IN_SET( #{deptId}, ALL_DEPT_IDS ) + + + + + + + + + + + + + + + + + + + + + + + UPDATE epdc_group_buy_info SET GRID = #{newDeptName}, UPDATED_TIME = NOW() WHERE GRID_ID = #{deptId} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuyPriceNumberDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuyPriceNumberDao.xml index d45857cb..bb16465c 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuyPriceNumberDao.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuyPriceNumberDao.xml @@ -15,6 +15,9 @@ + + delete from epdc_group_buy_price_number where GROUP_BUY_ID = #{id} + \ No newline at end of file diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/reportissue/CustomImgDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/reportissue/CustomImgDao.xml index fe8a1f35..85b98bbc 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/reportissue/CustomImgDao.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/reportissue/CustomImgDao.xml @@ -15,6 +15,9 @@ + + delete from epdc_custom_img where REFERENCE_ID = #{id} + \ No newline at end of file