From 92353c2c01ad8d83c38b96a33b9b0209ba766815 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Thu, 24 Dec 2020 18:41:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8B=BC=E5=9B=A2=E8=B4=AD=E5=90=8E=E5=8F=B0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/dto/GroupBuyEvaluationDTO.java | 7 +- .../elink/esua/epdc/dto/GroupBuyInfoDTO.java | 14 ++- .../epdc/dto/form/GroupBuyTopFormDTO.java | 35 +++++++ .../controller/GroupBuyInfoController.java | 64 ++++++++++++- .../groupbuy/dao/GroupBuyEvaluationDao.java | 18 +++- .../modules/groupbuy/dao/GroupBuyInfoDao.java | 30 +++++- .../groupbuy/dao/GroupBuySignUpDao.java | 21 +++- .../entity/GroupBuyEvaluationEntity.java | 6 +- .../groupbuy/entity/GroupBuyInfoEntity.java | 4 +- .../service/GroupBuyEvaluationService.java | 29 +++++- .../groupbuy/service/GroupBuyInfoService.java | 70 +++++++++++--- .../service/GroupBuySignUpService.java | 17 +++- .../impl/GroupBuyEvaluationServiceImpl.java | 43 ++++++++- .../service/impl/GroupBuyInfoServiceImpl.java | 66 +++++++++++-- .../impl/GroupBuySignUpServiceImpl.java | 9 +- .../src/main/resources/logback-spring.xml | 1 + .../mapper/groupBuy/GroupBuyEvaluationDao.xml | 30 ++++-- .../mapper/groupBuy/GroupBuyInfoDao.xml | 96 +++++++++++++------ .../mapper/groupBuy/GroupBuySignUpDao.xml | 18 +++- 19 files changed, 488 insertions(+), 90 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/GroupBuyTopFormDTO.java 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 f5bc01d4..75f2e7eb 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 @@ -21,10 +21,11 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; /** - * + * * * @author qu qu@elink-cn.com * @since v1.0.0 2020-12-23 @@ -66,7 +67,7 @@ public class GroupBuyEvaluationDTO implements Serializable { /** * 屏蔽标识 */ - private String shieldFlag; + private Integer shieldFlag; /** * 屏蔽人ID */ @@ -112,4 +113,4 @@ public class GroupBuyEvaluationDTO implements Serializable { */ private Date updatedTime; -} \ 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/GroupBuyInfoDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/GroupBuyInfoDTO.java index 1edfbf4e..bb2bbb9c 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 @@ -21,10 +21,11 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; /** - * 拼团购 + * 拼团购 * * @author qu qu@elink-cn.com * @since v1.0.0 2020-12-02 @@ -191,5 +192,14 @@ public class GroupBuyInfoDTO implements Serializable { */ private String cancelReason; + /** + * 价格 + */ + private List prices; + + /** + * 图片 + */ + List images; -} \ 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/GroupBuyTopFormDTO.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/GroupBuyTopFormDTO.java new file mode 100644 index 00000000..da4b4870 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-client/src/main/java/com/elink/esua/epdc/dto/form/GroupBuyTopFormDTO.java @@ -0,0 +1,35 @@ +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 Liuchuang + * @since 2020/12/23 16:55 + */ +@Data +public class GroupBuyTopFormDTO implements Serializable { + + private static final long serialVersionUID = 6643540483465553742L; + /** + * 团购记录ID + */ + @NotBlank(message = "团购记录ID不能为空") + private String id; + + /** + * 置顶标识：0-否，1-是 + */ + @NotNull(message = "置顶标识不能为空") + private Integer topFlag; + + /** + * 置顶人ID + */ + private String topUserId; +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/controller/GroupBuyInfoController.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/controller/GroupBuyInfoController.java index b0fad3e9..bbc15624 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/controller/GroupBuyInfoController.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/controller/GroupBuyInfoController.java @@ -25,7 +25,10 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.dto.GroupBuyEvaluationDTO; import com.elink.esua.epdc.dto.GroupBuyInfoDTO; +import com.elink.esua.epdc.dto.GroupBuySignUpDTO; +import com.elink.esua.epdc.dto.form.GroupBuyTopFormDTO; import com.elink.esua.epdc.dto.form.SdsPtgShieldFormDTO; import com.elink.esua.epdc.modules.groupbuy.excel.GroupBuyInfoExcel; import com.elink.esua.epdc.modules.groupbuy.service.GroupBuyInfoService; @@ -38,7 +41,7 @@ import java.util.Map; /** - * 拼团购 + * 拼团购 * * @author qu qu@elink-cn.com * @since v1.0.0 2020-12-02 @@ -46,7 +49,7 @@ import java.util.Map; @RestController @RequestMapping("groupbuyinfo") public class GroupBuyInfoController { - + @Autowired private GroupBuyInfoService groupBuyInfoService; @@ -106,4 +109,59 @@ public class GroupBuyInfoController { return groupBuyInfoService.modifyGroupBuyShieldFlag(formDto); } -} \ No newline at end of file + /** + * 置顶或取消置顶 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/12/23 17:00 + */ + @PostMapping("top") + public Result itemTop(@RequestBody GroupBuyTopFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return groupBuyInfoService.modifyTopFlag(formDto); + } + + /** + * 报名人员列表 + * + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2020/12/24 10:55 + */ + @GetMapping("signuplist") + public Result> signuplist(@RequestParam Map params) { + PageData data = groupBuyInfoService.listSignUp(params); + return new Result>().ok(data); + } + + /** + * 评价列表 + * + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2020/12/24 14:07 + */ + @GetMapping("evaluationlist") + public Result> evaluationlist(@RequestParam Map params) { + PageData data = groupBuyInfoService.listOfEvaluations(params); + return new Result>().ok(data); + } + + /** + * 屏蔽评价 + * + * @param ids + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/12/24 15:06 + */ + @PostMapping("shieldEvaluation") + public Result shieldEvaluation(@RequestBody String[] ids) { + return groupBuyInfoService.modifyEvaluationShieldFlag(ids); + } + +} 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 8d35a261..eb0637eb 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 @@ -20,13 +20,16 @@ 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.dto.GroupBuyEvaluationDTO; import com.elink.esua.epdc.modules.groupbuy.entity.GroupBuyEvaluationEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** - * + * * * @author qu qu@elink-cn.com * @since v1.0.0 2020-12-23 @@ -41,4 +44,15 @@ public interface GroupBuyEvaluationDao extends BaseDao * @return java.util.List **/ List getEvaluationList(EpdcSelectEvaluationListFormDTO formDTO); -} \ No newline at end of file + + /** + * 根据团购ID获取评价列表 + * + * @param params + * @return java.util.List + * @author Liuchuang + * @since 2020/12/24 14:11 + */ + List selectListOfEvaluationsByGroupBuyId(Map params); +} + 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 e7586187..12e86347 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,15 +19,20 @@ 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.form.GroupBuyTopFormDTO; +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; +import org.apache.ibatis.annotations.Param; import java.util.List; /** - * 拼团购 + * 拼团购 * * @author qu qu@elink-cn.com * @since v1.0.0 2020-12-02 @@ -90,4 +95,25 @@ public interface GroupBuyInfoDao extends BaseDao { * @return java.util.List **/ List getGroupBuySignUpList(EpdcSelectSignUpInfoListFormDTO formDTO); -} \ No newline at end of file + + /** + * 更新置顶状态 + * + * @param formDto + * @return void + * @author Liuchuang + * @since 2020/12/23 17:05 + */ + void updateTopFlagById(@Param("formDto") GroupBuyTopFormDTO formDto); + + /** + * 团购信息 + * + * @param id + * @return com.elink.esua.epdc.dto.GroupBuyInfoDTO + * @author Liuchuang + * @since 2020/12/23 17:50 + */ + GroupBuyInfoDTO selectOneGroupByInfo(@Param("id") String id); +} + diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/dao/GroupBuySignUpDao.java b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/dao/GroupBuySignUpDao.java index e96c13d3..ec569770 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/dao/GroupBuySignUpDao.java +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/java/com/elink/esua/epdc/modules/groupbuy/dao/GroupBuySignUpDao.java @@ -18,16 +18,31 @@ package com.elink.esua.epdc.modules.groupbuy.dao; import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.dto.GroupBuySignUpDTO; import com.elink.esua.epdc.modules.groupbuy.entity.GroupBuySignUpEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; /** - * 拼团购报名表 + * 拼团购报名表 * * @author qu qu@elink-cn.com * @since v1.0.0 2020-12-23 */ @Mapper public interface GroupBuySignUpDao extends BaseDao { - -} \ No newline at end of file + + /** + * 根据团购ID获取报名人员列表 + * + * @param params + * @return java.util.List + * @author Liuchuang + * @since 2020/12/24 11:05 + */ + List selectListSignUpByGroupBuyId(Map params); + +} 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 5b2c1098..695d285a 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 @@ -23,7 +23,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * + * * * @author qu qu@elink-cn.com * @since v1.0.0 2020-12-23 @@ -62,7 +62,7 @@ public class GroupBuyEvaluationEntity extends BaseEpdcEntity { /** * 屏蔽标识 */ - private String shieldFlag; + private Integer shieldFlag; /** * 屏蔽人ID */ @@ -79,4 +79,4 @@ public class GroupBuyEvaluationEntity extends BaseEpdcEntity { 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 84035fff..0ab93fa9 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 @@ -25,7 +25,7 @@ import lombok.EqualsAndHashCode; import java.util.Date; /** - * 拼团购 + * 拼团购 * * @author qu qu@elink-cn.com * @since v1.0.0 2020-12-02 @@ -162,4 +162,4 @@ public class GroupBuyInfoEntity extends BaseEpdcEntity { -} \ 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 01627b4f..08f8d4e1 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 @@ -30,7 +30,7 @@ import java.util.List; import java.util.Map; /** - * + * * * @author qu qu@elink-cn.com * @since v1.0.0 2020-12-23 @@ -97,7 +97,7 @@ public interface GroupBuyEvaluationService extends BaseService> **/ Result> getEvaluationList(EpdcSelectEvaluationListFormDTO formDTO); -} \ No newline at end of file + + /** + * 评价列表 + * + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2020/12/24 14:07 + */ + PageData listOfEvaluations(Map params); + + /** + * 屏蔽评价 + * + * @param ids + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/12/24 15:08 + */ + Result modifyEvaluationShieldFlag(String[] ids); +} + 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 0055d3ad..638d47e2 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 @@ -20,9 +20,17 @@ 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.GroupBuyInfoDTO; import com.elink.esua.epdc.dto.form.*; import com.elink.esua.epdc.dto.result.*; +import com.elink.esua.epdc.dto.GroupBuySignUpDTO; +import com.elink.esua.epdc.dto.form.EpdcAddGroupBuyInfoFormDTO; +import com.elink.esua.epdc.dto.form.EpdcSelectGroupBuyInfoListFormDTO; +import com.elink.esua.epdc.dto.form.GroupBuyTopFormDTO; +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.modules.groupbuy.entity.GroupBuyInfoEntity; import com.elink.esua.epdc.modules.rocketmq.dto.OrganizationModifyDTO; import com.elink.esua.epdc.modules.rocketmq.dto.RejectRecordDTO; @@ -31,7 +39,7 @@ import java.util.List; import java.util.Map; /** - * 拼团购 + * 拼团购 * * @author qu qu@elink-cn.com * @since v1.0.0 2020-12-02 @@ -98,7 +106,7 @@ public interface GroupBuyInfoService extends BaseService { */ void delete(String[] ids); /** - * @Description 获取首页列表 + * @Description 获取首页列表 * @Author songyunpeng * @Date 2020/12/2 * @Param [formDTO] @@ -106,7 +114,7 @@ public interface GroupBuyInfoService extends BaseService { **/ Result> getGroupBuyList(EpdcSelectGroupBuyInfoListFormDTO formDTO); /** - * @Description 详情 + * @Description 详情 * @Author songyunpeng * @Date 2020/12/2 * @Param [id] @@ -122,7 +130,7 @@ public interface GroupBuyInfoService extends BaseService { **/ Result publishOrUpdate(EpdcAddGroupBuyInfoFormDTO formDTO); /** - * @Description 删除 + * @Description 删除 * @Author songyunpeng * @Date 2020/12/2 * @Param [id] @@ -138,7 +146,7 @@ public interface GroupBuyInfoService extends BaseService { **/ Result callMobile(String id); /** - * @Description 删除拼团购信息 + * @Description 删除拼团购信息 * @Author songyunpeng * @Date 2020/12/4 * @Param [dto] @@ -146,7 +154,7 @@ public interface GroupBuyInfoService extends BaseService { **/ void rejectActInfo(RejectRecordDTO dto); /** - * @Description 修改组织机构信息 + * @Description 修改组织机构信息 * @Author songyunpeng * @Date 2020/12/4 * @Param [dto] @@ -162,7 +170,7 @@ public interface GroupBuyInfoService extends BaseService { **/ Result modifyGroupBuyShieldFlag(SdsPtgShieldFormDTO formDto); /** - * @Description 我的参与 + * @Description 我的参与 * @Author songyunpeng * @Date 2020/12/23 * @Param [formDTO] @@ -170,7 +178,7 @@ public interface GroupBuyInfoService extends BaseService { **/ Result> getMyGroupBuyJoin(EpdcSelectMyGroupBuyJoinInfoListFormDTO formDTO); /** - * @Description 我的发布 + * @Description 我的发布 * @Author songyunpeng * @Date 2020/12/23 * @Param [formDTO] @@ -178,7 +186,7 @@ public interface GroupBuyInfoService extends BaseService { **/ Result> getMyGroupBuyPublish(EpdcSelectMyGroupBuyPublishInfoListFormDTO formDTO); /** - * @Description 获取交易列表 + * @Description 获取交易列表 * @Author songyunpeng * @Date 2020/12/23 * @Param [formDTO] @@ -186,11 +194,51 @@ public interface GroupBuyInfoService extends BaseService { **/ Result> getGroupBuySignUpList(EpdcSelectSignUpInfoListFormDTO formDTO); /** - * @Description 我的发布取消/结束 + * @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 + + /** + * 置顶或取消置顶 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/12/23 17:01 + */ + Result modifyTopFlag(GroupBuyTopFormDTO formDto); + + /** + * 报名人员列表 + * + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @author Liuchuang + * @since 2020/12/24 10:57 + */ + PageData listSignUp(Map params); + + /** + * 评价列表 + * + * @param params + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author Liuchuang + * @since 2020/12/24 14:07 + */ + PageData listOfEvaluations(Map params); + + /** + * 屏蔽评价 + * + * @param ids + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author Liuchuang + * @since 2020/12/24 15:08 + */ + Result modifyEvaluationShieldFlag(String[] ids); +} 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 c10e0f6b..bfb23551 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 @@ -29,7 +29,7 @@ import java.util.List; import java.util.Map; /** - * 拼团购报名表 + * 拼团购报名表 * * @author qu qu@elink-cn.com * @since v1.0.0 2020-12-23 @@ -104,7 +104,7 @@ public interface GroupBuySignUpService extends BaseService **/ Result tradeConfirmation(EpdcTradeConfirmationFormDTO formDTO); /** - * @Description 报名/取消报名 + * @Description 报名/取消报名 * @Author songyunpeng * @Date 2020/12/24 * @Param [formDTO] @@ -112,4 +112,15 @@ public interface GroupBuySignUpService extends BaseService **/ Result signUpOrCancel(EpdcSignUpOrCancelFormDTO formDTO); -} \ No newline at end of file + + /** + * 报名人员列表 + * + * @param params + * @return com.elink.esua.epdc.commons.tools.page.PageData + * @author Liuchuang + * @since 2020/12/24 10:57 + */ + PageData listSignUp(Map params); +} + 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 225802d0..754be097 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 @@ -23,6 +23,8 @@ 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.security.user.SecurityUser; +import com.elink.esua.epdc.commons.tools.security.user.UserDetail; 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; @@ -40,12 +42,13 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; /** - * + * * * @author qu qu@elink-cn.com * @since v1.0.0 2020-12-23 @@ -134,4 +137,40 @@ public class GroupBuyEvaluationServiceImpl extends BaseServiceImpl listOfEvaluations(Map params) { + IPage page = getPage(params); + List list = baseDao.selectListOfEvaluationsByGroupBuyId(params); + return new PageData<>(list, page.getTotal()); + } + + @Override + public Result modifyEvaluationShieldFlag(String[] ids) { + if (ids.length <= 0) { + return new Result(); + } + UserDetail userDetail = SecurityUser.getUser(); + String shieldUserId = ""; + String shieldUserName = ""; + if (null != userDetail) { + shieldUserId = userDetail.getId().toString(); + shieldUserName= userDetail.getRealName(); + } + List entities = new ArrayList<>(); + for (String id: + ids) { + GroupBuyEvaluationEntity entity = new GroupBuyEvaluationEntity(); + entity.setId(id); + entity.setShieldFlag(NumConstant.ONE); + entity.setShieldUserId(shieldUserId); + entity.setShieldUserName(shieldUserName); + entities.add(entity); + } + + updateBatchById(entities); + + return new Result(); + } + +} + 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 a57ce13e..0cde91f2 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 @@ -23,6 +23,7 @@ import com.elink.esua.epdc.async.NewsTask; 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.exception.RenException; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.content.CheckDataUtils; import com.elink.esua.epdc.commons.tools.security.content.ModuleName; @@ -30,13 +31,23 @@ import com.elink.esua.epdc.commons.tools.security.content.dto.form.ParentAndAllD import com.elink.esua.epdc.commons.tools.security.content.dto.form.SaveCheckRecordsDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultDTO; import com.elink.esua.epdc.commons.tools.security.content.dto.result.CheckResultMessageDTO; +import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; +import com.elink.esua.epdc.commons.tools.security.user.UserDetail; 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.GroupBuyEvaluationDTO; import com.elink.esua.epdc.dto.GroupBuyInfoDTO; import com.elink.esua.epdc.dto.GroupBuyPriceNumberDTO; +import com.elink.esua.epdc.dto.GroupBuySignUpDTO; 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.GroupBuyTopFormDTO; +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; @@ -44,8 +55,11 @@ 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.service.GroupBuyEvaluationService; import com.elink.esua.epdc.modules.groupbuy.entity.GroupBuyPriceNumberEntity; import com.elink.esua.epdc.modules.groupbuy.service.GroupBuyInfoService; +import com.elink.esua.epdc.modules.groupbuy.service.GroupBuySignUpService; 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; @@ -61,7 +75,7 @@ import java.util.List; import java.util.Map; /** - * 拼团购 + * 拼团购 * * @author qu qu@elink-cn.com * @since v1.0.0 2020-12-02 @@ -79,6 +93,12 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); String groupBuyTitle = (String)params.get("groupBuyTitle"); + String groupBuyStatus = (String)params.get("groupBuyStatus"); String startTime = (String)params.get("startTime"); String endTime = (String)params.get("endTime"); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); wrapper.like(StringUtils.isNotBlank(groupBuyTitle), "GROUP_BUY_TITLE", groupBuyTitle.trim()); + if (StringUtils.isNotBlank(groupBuyStatus)) { + wrapper.eq("GROUP_BUY_STATUS", Integer.valueOf(groupBuyStatus)); + } wrapper.ge(StringUtils.isNotBlank(startTime), "DATE_FORMAT(CREATED_TIME, '%Y-%m-%d' )", startTime); wrapper.le(StringUtils.isNotBlank(endTime), "DATE_FORMAT(CREATED_TIME, '%Y-%m-%d' )", endTime); - wrapper.orderByAsc("SORT"); + wrapper.orderByDesc("TOP_FLAG"); + wrapper.orderByDesc("TOP_TIME"); + wrapper.orderByAsc("GROUP_BUY_STATUS"); wrapper.orderByDesc("CREATED_TIME"); return wrapper; @@ -120,8 +144,7 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl listSignUp(Map params) { + return groupBuySignUpService.listSignUp(params); + } + + @Override + public PageData listOfEvaluations(Map params) { + return groupBuyEvaluationService.listOfEvaluations(params); + } + + @Override + public Result modifyEvaluationShieldFlag(String[] ids) { + return groupBuyEvaluationService.modifyEvaluationShieldFlag(ids); + } +} 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 d20968b3..54a25f9f 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 @@ -151,4 +151,11 @@ public class GroupBuySignUpServiceImpl extends BaseServiceImpl listSignUp(Map params) { + IPage page = getPage(params); + List list = baseDao.selectListSignUpByGroupBuyId(params); + return new PageData<>(list, page.getTotal()); + } + +} diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/logback-spring.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/logback-spring.xml index 9e571f7e..7b59e177 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/logback-spring.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/logback-spring.xml @@ -140,6 +140,7 @@ + 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 6b7bf24e..816942b6 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 @@ -3,19 +3,13 @@ - + - - - - - - - - + + @@ -43,5 +37,21 @@ order by t.CREATED_TIME desc + - \ 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 a2631215..a13889fd 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 @@ -2,36 +2,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -205,4 +175,68 @@ UPDATE epdc_group_buy_info SET GRID = #{newDeptName}, UPDATED_TIME = NOW() WHERE GRID_ID = #{deptId} - \ No newline at end of file + + UPDATE epdc_group_buy_info SET TOP_FLAG = #{formDto.topFlag}, TOP_USER_ID = #{formDto.topUserId} + + , TOP_TIME = NULL + + + , TOP_TIME = NOW() + + WHERE ID = #{formDto.id} + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuySignUpDao.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuySignUpDao.xml index 403eafde..36789fb6 100644 --- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuySignUpDao.xml +++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/mapper/groupBuy/GroupBuySignUpDao.xml @@ -20,5 +20,21 @@ + - \ No newline at end of file +