拼团购后台管理功能 init

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

@@ -21,6 +21,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -66,7 +67,7 @@ public class GroupBuyEvaluationDTO implements Serializable {
     /**
      * 屏蔽标识
      */
-    private String shieldFlag;
+    private Integer shieldFlag;
     /**
      * 屏蔽人ID
      */

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

@@ -21,6 +21,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 
 /**
@@ -191,5 +192,14 @@ public class GroupBuyInfoDTO implements Serializable {
      */
     private String cancelReason;
 
+    /**
+     * 价格
+     */
+    private List<GroupBuyPriceNumberDTO> prices;
+
+    /**
+     * 图片
+     */
+    List<String> images;
 
 }

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;
+}

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;
@@ -106,4 +109,59 @@ public class GroupBuyInfoController {
         return groupBuyInfoService.modifyGroupBuyShieldFlag(formDto);
     }
 
+    /**
+     * 置顶或取消置顶
+     *
+     * @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<java.util.List<com.elink.esua.epdc.dto.GroupBuySignUpDTO>>
+     * @author Liuchuang
+     * @since 2020/12/24 10:55
+     */
+    @GetMapping("signuplist")
+    public Result<PageData<GroupBuySignUpDTO>> signuplist(@RequestParam Map<String, Object> params) {
+        PageData<GroupBuySignUpDTO> data = groupBuyInfoService.listSignUp(params);
+        return new Result<PageData<GroupBuySignUpDTO>>().ok(data);
+    }
+
+    /**
+     * 评价列表
+     *
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.GroupBuyEvaluationDTO>>
+     * @author Liuchuang
+     * @since 2020/12/24 14:07
+     */
+    @GetMapping("evaluationlist")
+    public Result<PageData<GroupBuyEvaluationDTO>> evaluationlist(@RequestParam Map<String, Object> params) {
+        PageData<GroupBuyEvaluationDTO> data = groupBuyInfoService.listOfEvaluations(params);
+        return new Result<PageData<GroupBuyEvaluationDTO>>().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);
+    }
+
 }

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

@@ -20,10 +20,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.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;
 
 /**
  *
@@ -41,4 +44,15 @@ public interface GroupBuyEvaluationDao extends BaseDao<GroupBuyEvaluationEntity>
      * @return java.util.List<com.elink.esua.epdc.dto.result.EpdcSelectEvaluationListResultDTO>
      **/
     List<EpdcSelectEvaluationListResultDTO> getEvaluationList(EpdcSelectEvaluationListFormDTO formDTO);
+
+    /**
+     * 根据团购ID获取评价列表
+     *
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.dto.GroupBuyEvaluationDTO>
+     * @author Liuchuang
+     * @since 2020/12/24 14:11
+     */
+    List<GroupBuyEvaluationDTO> selectListOfEvaluationsByGroupBuyId(Map<String, Object> params);
 }
+

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

@@ -19,10 +19,15 @@ 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;
 
@@ -90,4 +95,25 @@ public interface GroupBuyInfoDao extends BaseDao<GroupBuyInfoEntity> {
      * @return java.util.List<com.elink.esua.epdc.dto.result.EpdcSelectSignUpInfoListResultDTO>
      **/
     List<EpdcSelectSignUpInfoListResultDTO> getGroupBuySignUpList(EpdcSelectSignUpInfoListFormDTO formDTO);
+
+    /**
+     * 更新置顶状态
+     *
+     * @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);
 }
+

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

@@ -18,8 +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.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;
 
 /**
  * 拼团购报名表
@@ -30,4 +35,14 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface GroupBuySignUpDao extends BaseDao<GroupBuySignUpEntity> {
 
+    /**
+     * 根据团购ID获取报名人员列表
+     *
+     * @param params
+     * @return java.util.List<com.elink.esua.epdc.dto.GroupBuySignUpDTO>
+     * @author Liuchuang
+     * @since 2020/12/24 11:05
+     */
+    List<GroupBuySignUpDTO> selectListSignUpByGroupBuyId(Map<String, Object> params);
+
 }

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

@@ -62,7 +62,7 @@ public class GroupBuyEvaluationEntity extends BaseEpdcEntity {
     /**
      * 屏蔽标识
      */
-    private String shieldFlag;
+    private Integer shieldFlag;
     /**
      * 屏蔽人ID
      */

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

@@ -112,4 +112,25 @@ public interface GroupBuyEvaluationService extends BaseService<GroupBuyEvaluatio
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.result.EpdcSelectEvaluationListResultDTO>>
      **/
     Result<List<EpdcSelectEvaluationListResultDTO>> getEvaluationList(EpdcSelectEvaluationListFormDTO formDTO);
+
+    /**
+     * 评价列表
+     *
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.GroupBuyEvaluationDTO>>
+     * @author Liuchuang
+     * @since 2020/12/24 14:07
+     */
+    PageData<GroupBuyEvaluationDTO> listOfEvaluations(Map<String, Object> params);
+
+    /**
+     * 屏蔽评价
+     *
+     * @param ids
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author Liuchuang
+     * @since 2020/12/24 15:08
+     */
+    Result modifyEvaluationShieldFlag(String[] ids);
 }
+

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;
@@ -193,4 +201,44 @@ public interface GroupBuyInfoService extends BaseService<GroupBuyInfoEntity> {
      * @return com.elink.esua.epdc.commons.tools.utils.Result
      **/
     Result updateStatus(EpdcUpdateStatusFormDTO formDTO);
+
+    /**
+     * 置顶或取消置顶
+     *
+     * @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<com.elink.esua.epdc.dto.GroupBuySignUpDTO>
+     * @author Liuchuang
+     * @since 2020/12/24 10:57
+     */
+    PageData<GroupBuySignUpDTO> listSignUp(Map<String, Object> params);
+
+    /**
+     * 评价列表
+     *
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.GroupBuyEvaluationDTO>>
+     * @author Liuchuang
+     * @since 2020/12/24 14:07
+     */
+    PageData<GroupBuyEvaluationDTO> listOfEvaluations(Map<String, Object> params);
+
+    /**
+     * 屏蔽评价
+     *
+     * @param ids
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author Liuchuang
+     * @since 2020/12/24 15:08
+     */
+    Result modifyEvaluationShieldFlag(String[] ids);
 }

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

@@ -112,4 +112,15 @@ public interface GroupBuySignUpService extends BaseService<GroupBuySignUpEntity>
      **/
     Result signUpOrCancel(EpdcSignUpOrCancelFormDTO formDTO);
 
+
+    /**
+     * 报名人员列表
+     *
+     * @param params
+     * @return com.elink.esua.epdc.commons.tools.page.PageData<com.elink.esua.epdc.dto.GroupBuySignUpDTO>
+     * @author Liuchuang
+     * @since 2020/12/24 10:57
+     */
+    PageData<GroupBuySignUpDTO> listSignUp(Map<String, Object> params);
 }
+

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,6 +42,7 @@ 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;
@@ -134,4 +137,40 @@ public class GroupBuyEvaluationServiceImpl extends BaseServiceImpl<GroupBuyEvalu
         return new Result().ok(list);
     }
 
+    @Override
+    public PageData<GroupBuyEvaluationDTO> listOfEvaluations(Map<String, Object> params) {
+        IPage<GroupBuyEvaluationDTO> page = getPage(params);
+        List<GroupBuyEvaluationDTO> 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<GroupBuyEvaluationEntity> 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();
+    }
+
 }
+

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;
@@ -79,6 +93,12 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl<GroupBuyInfoDao, Gr
     @Autowired
     private ContentSecurityFeignClient contentSecurityFeign;
 
+    @Autowired
+    private GroupBuySignUpService groupBuySignUpService;
+
+    @Autowired
+    private GroupBuyEvaluationService groupBuyEvaluationService;
+
     @Autowired
     private GroupBuyPriceNumberDao groupBuyPriceNumberDao;
 
@@ -102,17 +122,21 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl<GroupBuyInfoDao, Gr
     }
 
     private QueryWrapper<GroupBuyInfoEntity> getWrapper(Map<String, Object> 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<GroupBuyInfoEntity> 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<GroupBuyInfoDao, Gr
 
     @Override
     public GroupBuyInfoDTO get(String id) {
-        GroupBuyInfoEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, GroupBuyInfoDTO.class);
+        return baseDao.selectOneGroupByInfo(id);
     }
 
     @Override
@@ -415,4 +438,33 @@ public class GroupBuyInfoServiceImpl extends BaseServiceImpl<GroupBuyInfoDao, Gr
 
         return entities;
     }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Result modifyTopFlag(GroupBuyTopFormDTO formDto) {
+        UserDetail user = SecurityUser.getUser();
+        if (null == user) {
+            throw new RenException("登陆信息已过期，请退出重新登陆");
+        }
+        formDto.setTopUserId(user.getId() == null ? "":user.getId().toString());
+        // 更新置顶状态
+        baseDao.updateTopFlagById(formDto);
+
+        return new Result();
+    }
+
+    @Override
+    public PageData<GroupBuySignUpDTO> listSignUp(Map<String, Object> params) {
+        return groupBuySignUpService.listSignUp(params);
+    }
+
+    @Override
+    public PageData<GroupBuyEvaluationDTO> listOfEvaluations(Map<String, Object> params) {
+        return groupBuyEvaluationService.listOfEvaluations(params);
+    }
+
+    @Override
+    public Result modifyEvaluationShieldFlag(String[] ids) {
+        return groupBuyEvaluationService.modifyEvaluationShieldFlag(ids);
+    }
 }

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<GroupBuySignUpDao
         return new Result();
     }
 
+    @Override
+    public PageData<GroupBuySignUpDTO> listSignUp(Map<String, Object> params) {
+        IPage<GroupBuySignUpDTO> page = getPage(params);
+        List<GroupBuySignUpDTO> list = baseDao.selectListSignUpByGroupBuyId(params);
+        return new PageData<>(list, page.getTotal());
+    }
+
 }

esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/logback-spring.xml

@@ -140,6 +140,7 @@
         <logger name="com.elink.esua.epdc.modules.feign.dao" level="DEBUG"/>
         <logger name="com.elink.esua.epdc.modules.module.dao" level="DEBUG"/>
         <logger name="com.elink.esua.epdc.modules.specialuser.dao" level="DEBUG"/>
+        <logger name="com.elink.esua.epdc.modules.groupbuy.dao" level="DEBUG"/>
         <root level="INFO">
             <appender-ref ref="DEBUG_FILE"/>
             <appender-ref ref="INFO_FILE"/>

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

@@ -3,19 +3,13 @@
 
 <mapper namespace="com.elink.esua.epdc.modules.groupbuy.dao.GroupBuyEvaluationDao">
 
-    <resultMap type="com.elink.esua.epdc.modules.groupbuy.entity.GroupBuyEvaluationEntity" id="groupBuyEvaluationMap">
+    <resultMap type="com.elink.esua.epdc.dto.GroupBuyEvaluationDTO" id="groupBuyEvaluationMap">
         <result property="id" column="ID"/>
-        <result property="userId" column="USER_ID"/>
-        <result property="groupBuyId" column="GROUP_BUY_ID"/>
-        <result property="faceImg" column="FACE_IMG"/>
         <result property="nickname" column="NICKNAME"/>
         <result property="evaluationContent" column="EVALUATION_CONTENT"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
         <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
+        <result property="shieldFlag" column="SHIELD_FLAG"/>
+        <result property="shieldReason" column="SHIELD_REASON"/>
     </resultMap>
     <resultMap id="getEvaluationListMap"
                type="com.elink.esua.epdc.dto.result.EpdcSelectEvaluationListResultDTO">
@@ -43,5 +37,21 @@
          order by t.CREATED_TIME desc
     </select>
 
+    <select id="selectListOfEvaluationsByGroupBuyId" resultMap="groupBuyEvaluationMap">
+        SELECT
+            e.ID,
+            e.NICKNAME,
+            e.EVALUATION_CONTENT,
+            e.CREATED_TIME,
+            e.SHIELD_FLAG,
+            e.SHIELD_REASON
+        FROM
+            epdc_group_buy_evaluation e
+        WHERE
+            e.DEL_FLAG = '0'
+          AND e.GROUP_BUY_ID = #{groupBuyId}
+        ORDER BY
+            e.CREATED_TIME DESC
+    </select>
 
 </mapper>

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

@@ -2,36 +2,6 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.elink.esua.epdc.modules.groupbuy.dao.GroupBuyInfoDao">
-
-    <resultMap type="com.elink.esua.epdc.modules.groupbuy.entity.GroupBuyInfoEntity" id="groupBuyInfoMap">
-        <result property="id" column="ID"/>
-        <result property="groupBuyTitle" column="GROUP_BUY_TITLE"/>
-        <result property="groupBuyMobile" column="GROUP_BUY_MOBILE"/>
-        <result property="groupBuyContent" column="GROUP_BUY_CONTENT"/>
-        <result property="browseNum" column="BROWSE_NUM"/>
-        <result property="callNum" column="CALL_NUM"/>
-        <result property="realName" column="REAL_NAME"/>
-        <result property="userId" column="USER_ID"/>
-        <result property="nickname" column="NICKNAME"/>
-        <result property="faceImg" column="FACE_IMG"/>
-        <result property="publishMobile" column="PUBLISH_MOBILE"/>
-        <result property="gridId" column="GRID_ID"/>
-        <result property="grid" column="GRID"/>
-        <result property="parentDeptIds" column="PARENT_DEPT_IDS"/>
-        <result property="parentDeptNames" column="PARENT_DEPT_NAMES"/>
-        <result property="allDeptIds" column="ALL_DEPT_IDS"/>
-        <result property="allDeptNames" column="ALL_DEPT_NAMES"/>
-        <result property="shieldFlag" column="SHIELD_FLAG"/>
-        <result property="shieldUserId" column="SHIELD_USER_ID"/>
-        <result property="shieldUserName" column="SHIELD_USER_NAME"/>
-        <result property="shieldReason" column="SHIELD_REASON"/>
-        <result property="delFlag" column="DEL_FLAG"/>
-        <result property="revision" column="REVISION"/>
-        <result property="createdBy" column="CREATED_BY"/>
-        <result property="createdTime" column="CREATED_TIME"/>
-        <result property="updatedBy" column="UPDATED_BY"/>
-        <result property="updatedTime" column="UPDATED_TIME"/>
-    </resultMap>
     <resultMap id="getGroupBuyListMap" type="com.elink.esua.epdc.dto.result.EpdcSelectGroupBuyInfoListResultDTO">
         <result property="id" column="ID"/>
         <result property="groupBuyTitle" column="GROUP_BUY_TITLE"/>
@@ -205,4 +175,68 @@
         UPDATE epdc_group_buy_info SET GRID = #{newDeptName}, UPDATED_TIME = NOW() WHERE GRID_ID = #{deptId}
     </update>
 
+    <update id="updateTopFlagById">
+        UPDATE epdc_group_buy_info SET TOP_FLAG = #{formDto.topFlag}, TOP_USER_ID = #{formDto.topUserId}
+        <if test='formDto.topFlag == 0'>
+            , TOP_TIME = NULL
+        </if>
+        <if test='formDto.topFlag == 1'>
+            , TOP_TIME = NOW()
+        </if>
+        WHERE ID = #{formDto.id}
+    </update>
+
+    <resultMap type="com.elink.esua.epdc.dto.GroupBuyInfoDTO" id="groupBuyInfoMap">
+        <result property="id" column="ID"/>
+        <result property="groupBuyTitle" column="GROUP_BUY_TITLE"/>
+        <result property="groupBuyMobile" column="GROUP_BUY_MOBILE"/>
+        <result property="groupBuyContent" column="GROUP_BUY_CONTENT"/>
+        <result property="browseNum" column="BROWSE_NUM"/>
+        <result property="shieldFlag" column="SHIELD_FLAG"/>
+        <result property="shieldReason" column="SHIELD_REASON"/>
+        <result property="topFlag" column="TOP_FLAG"/>
+        <result property="topTime" column="TOP_TIME"/>
+        <result property="groupBuyStatus" column="GROUP_BUY_STATUS"/>
+        <result property="cancelReason" column="CANCEL_REASON"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <collection property="prices" ofType="com.elink.esua.epdc.dto.GroupBuyPriceNumberDTO">
+            <result property="groupBuyNumber" column="GROUP_BUY_NUMBER"/>
+            <result property="groupBuyPrice" column="GROUP_BUY_PRICE"/>
+        </collection>
+        <collection property="images" ofType="java.lang.String">
+            <result column="IMG_URL"/>
+        </collection>
+    </resultMap>
+    <select id="selectOneGroupByInfo" resultMap="groupBuyInfoMap">
+        SELECT
+            i.ID,
+            i.GROUP_BUY_TITLE,
+            i.GROUP_BUY_MOBILE,
+            i.GROUP_BUY_CONTENT,
+            i.BROWSE_NUM,
+            i.SHIELD_FLAG,
+            i.SHIELD_REASON,
+            i.TOP_FLAG,
+            i.TOP_TIME,
+            i.GROUP_BUY_STATUS,
+            i.CANCEL_REASON,
+            i.CREATED_TIME,
+            n.GROUP_BUY_NUMBER,
+            n.GROUP_BUY_PRICE,
+            img.IMG_URL
+        FROM
+            `epdc_group_buy_info` i
+            LEFT JOIN epdc_group_buy_price_number n ON n.GROUP_BUY_ID = i.ID
+            AND n.DEL_FLAG = '0'
+            LEFT JOIN epdc_custom_img img ON img.REFERENCE_ID = i.ID
+            AND img.DEL_FLAG = '0'
+            AND img.IMG_TYPE = 'group_buy'
+        WHERE
+            i.ID = #{id}
+        ORDER BY
+            n.GROUP_BUY_NUMBER,
+            img.IMG_URL
+    </select>
+
 </mapper>
+

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

@@ -20,5 +20,21 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
+    <select id="selectListSignUpByGroupBuyId" resultType="com.elink.esua.epdc.dto.GroupBuySignUpDTO">
+        SELECT
+            ID,
+            MOBILE,
+            NICKNAME,
+            SIGN_UP_STATUS,
+            SIGN_UP_TIME
+        FROM
+            epdc_group_buy_sign_up
+        WHERE
+            DEL_FLAG = '0'
+          AND SIGN_UP_STATUS IN ( 0, 5 )
+          AND GROUP_BUY_ID = #{groupBuyId}
+        ORDER BY
+            CREATED_TIME DESC
+    </select>
 
 </mapper>