Merge branch 'hjc_yb_banner' into pre

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/param/SweetYbEnrollParam.java

@@ -46,4 +46,9 @@ public class SweetYbEnrollParam implements Serializable {
     @ApiModelProperty(position = 19, required = false, value = "活动id", example = "0")
     private String activityId;
 
+    @ApiModelProperty(position = 20, required = false, value = "平均年龄", example = "0")
+    private Integer age;
+
+
+
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/sweet/SweetYbActivityController.java

 package com.liquidnet.client.admin.web.controller.zhengzai.sweet;
 
 
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.common.core.controller.BaseController;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.core.page.TableDataInfo;
 import com.liquidnet.client.admin.common.utils.poi.ExcelUtil;
@@ -35,7 +37,7 @@ import java.util.List;
 @Api(tags = "YB活动管理")
 @RestController
 @RequestMapping("/sweet/activity")
-public class SweetYbActivityController {
+public class SweetYbActivityController extends BaseController {
 
     @Autowired
     ISweetYbActivityService sweetYbActivityService;
@@ -80,12 +82,13 @@ public class SweetYbActivityController {
     @ApiOperation("活动列表")
     @ResponseBody
     public TableDataInfo aList(SweetYbActivityListParam param) {
-        PageInfo<SweetYbActivityVo> result = sweetYbActivityService.aList(param);
-        TableDataInfo rspData = new TableDataInfo();
-        rspData.setCode(0);
-        rspData.setRows(result.getList());
-        rspData.setTotal(result.getTotal());
-        return rspData;
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+        List<SweetYbActivity> result = sweetYbActivityService.aList(param);
+//        TableDataInfo rspData = new TableDataInfo();
+//        rspData.setCode(0);
+//        rspData.setRows(result.getList());
+//        rspData.setTotal(result.getTotal());
+        return getDataTable(result);
     }
 
     @PostMapping("/export")

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/yb/bannerList.html

@@ -117,7 +117,7 @@
                 // onCheckAll: onCheckAll,
                 sortName: "createdAt",
                 sortOrder: "desc",
-                modalName: "活动",
+                modalName: "本活动名单",
                 columns: [
                     {
                         field: 'cover',

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/yb/creatAndEdit.html

@@ -173,6 +173,10 @@
             $(this).fileinput("upload");
         })
         .on("fileuploaded", function (event, data) {       //上传回调事件
+            console.log(event, data, '????')
+            if (data.response.code == 1) {
+                return layer.msg(data.response.message)
+            }
             let showPicture = 'https://img.zhengzai.tv/' + data.response.data.ossPath;
             $("#viewImg").attr('src', showPicture)
         })

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/dto/SweetYbActivityExportVo.java

@@ -11,12 +11,16 @@ import java.time.format.DateTimeFormatter;
 
 @Data
 public class SweetYbActivityExportVo implements Serializable, Cloneable {
+    @Excel(name = "活动名称", cellType = Excel.ColumnType.STRING)
+    private String activityName;
     @Excel(name = "联系电话", cellType = Excel.ColumnType.STRING)
     private String contactTell;
     @Excel(name = "联系微信", cellType = Excel.ColumnType.STRING)
     private String contactWechat;
     @Excel(name = "乐队名称", cellType = Excel.ColumnType.STRING)
     private String nickname;
+    @Excel(name = "平均年龄", cellType = Excel.ColumnType.STRING)
+    private String age;
     @Excel(name = "风格", cellType = Excel.ColumnType.STRING)
     private String style;
     @Excel(name = "图片地址", cellType = Excel.ColumnType.STRING)
@@ -42,7 +46,9 @@ public class SweetYbActivityExportVo implements Serializable, Cloneable {
         return new SweetYbActivityExportVo();
     }
 
-    public SweetYbActivityExportVo copyOrderExportVo(SweetYbEnroll source) {
+    public SweetYbActivityExportVo copyOrderExportVo(SweetYbEnroll source,String name) {
+        this.setActivityName(name);
+        this.setAge(source.getAge()+"");
         this.setContactTell(source.getContactTell());
         this.setContactWechat(source.getContactWechat());
         this.setNickname(source.getNickname());

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/ISweetYbActivityService.java

@@ -31,7 +31,7 @@ public interface ISweetYbActivityService  {
 
     SweetYbActivityVo aDetails(String activityId);
 
-    PageInfo<SweetYbActivityVo> aList(SweetYbActivityListParam param);
+    List<SweetYbActivity> aList(SweetYbActivityListParam param);
 
     AjaxResult aUpdate(SweetYbActivityParam param);
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/service/impl/SweetYbActivityServiceImpl.java

 package com.liquidnet.client.admin.zhengzai.sweet.service.impl;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
 import com.liquidnet.client.admin.common.exception.BusinessException;
-import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderDetailedExportVo;
 import com.liquidnet.client.admin.zhengzai.sweet.dto.SweetYbActivityExportVo;
-import com.liquidnet.client.admin.zhengzai.sweet.service.ISweetAdminQrCodeService;
 import com.liquidnet.client.admin.zhengzai.sweet.service.ISweetYbActivityService;
 import com.liquidnet.client.admin.zhengzai.sweet.utils.SweetRedisAdminUtils;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
-import com.liquidnet.service.kylin.dao.OrderExportDao;
-import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
-import com.liquidnet.service.kylin.dto.param.CreateActiveQrCodeParam;
 import com.liquidnet.service.sweet.dto.param.admin.SweetYbActivityListParam;
 import com.liquidnet.service.sweet.dto.param.admin.SweetYbActivityParam;
 import com.liquidnet.service.sweet.dto.vo.SweetYbActivityVo;
-import com.liquidnet.service.sweet.entity.SweetQrCode;
 import com.liquidnet.service.sweet.entity.SweetYbActivity;
 import com.liquidnet.service.sweet.entity.SweetYbEnroll;
-import com.liquidnet.service.sweet.mapper.SweetQrCodeMapper;
 import com.liquidnet.service.sweet.mapper.SweetYbActivityMapper;
 import com.liquidnet.service.sweet.mapper.SweetYbEnrollMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
@@ -84,16 +73,15 @@ public class SweetYbActivityServiceImpl implements ISweetYbActivityService {
     }
 
     @Override
-    public PageInfo<SweetYbActivityVo> aList(SweetYbActivityListParam param) {
-        PageInfo<SweetYbActivityVo> pageInfo;
-        List<SweetYbActivity> data = sweetYbActivityMapper.selectList(Wrappers.lambdaQuery(SweetYbActivity.class).like(SweetYbActivity::getTitle, param.getTitle()));
-        List<SweetYbActivityVo> voList = new ArrayList<>();
-        for (SweetYbActivity entity : data) {
-            SweetYbActivityVo vo = initVo(entity);
-            voList.add(vo);
-        }
-        pageInfo = new PageInfo(voList);
-        return pageInfo;
+    public List<SweetYbActivity> aList(SweetYbActivityListParam param) {
+        List<SweetYbActivity> data = sweetYbActivityMapper.selectList(Wrappers.lambdaQuery(SweetYbActivity.class).like(SweetYbActivity::getTitle, param.getTitle()).orderByDesc(SweetYbActivity::getCreatedAt));
+//        List<SweetYbActivityVo> voList = new ArrayList<>();
+//        for (SweetYbActivity entity : data) {
+//            SweetYbActivityVo vo = initVo(entity);
+//            voList.add(vo);
+//        }
+//        pageInfo = new PageInfo(voList);
+        return data;
     }
 
     @Override
@@ -151,10 +139,11 @@ public class SweetYbActivityServiceImpl implements ISweetYbActivityService {
     @Override
     public List<SweetYbActivityExportVo> aExport(String activityId) {
         try {
+            SweetYbActivity activity = sweetYbActivityMapper.selectOne(Wrappers.lambdaQuery(SweetYbActivity.class).eq(SweetYbActivity::getActivityId, activityId));
             List<SweetYbEnroll> list = sweetYbEnrollMapper.selectList(Wrappers.lambdaQuery(SweetYbEnroll.class).eq(SweetYbEnroll::getActivityId, activityId));
             List<SweetYbActivityExportVo> voList = new ArrayList();
             for (SweetYbEnroll item : list) {
-                voList.add(SweetYbActivityExportVo.getNew().copyOrderExportVo(item));
+                voList.add(SweetYbActivityExportVo.getNew().copyOrderExportVo(item, activity.getTitle()));
             }
             return voList;
         } catch (Exception e) {

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetYbEnroll.java

@@ -70,6 +70,11 @@ public class SweetYbEnroll implements Serializable {
      */
     private String cityName;
 
+    /**
+     * 平均年龄
+     */
+    private int age;
+
     /**
      * 活动id
      */

liquidnet-bus-service/liquidnet-service-sweet/docu/db_sweetsugar_structure.sql

@@ -512,6 +512,8 @@ alter table sweet_yb_enroll
     add city_name varchar(255) NOT NULL DEFAULT '' COMMENT '常驻城市名称' after universities;
 alter table sweet_yb_enroll
     add activity_id varchar(255) DEFAULT '0' COMMENT '活动id' after city_name;
+alter table sweet_yb_enroll
+    add age int DEFAULT 0 COMMENT '平均年龄' after city_name;
 
 -- YB活动
 drop TABLE if exists `sweet_yb_activity`;

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetYbEnrollServiceImpl.java

@@ -15,6 +15,7 @@ import com.liquidnet.service.sweet.service.ISweetYbEnrollService;
 import com.liquidnet.service.sweet.utils.ObjectUtil;
 import com.liquidnet.service.sweet.utils.QueueUtils;
 import com.liquidnet.service.sweet.utils.RedisDataUtils;
+import org.apache.logging.log4j.util.PropertySource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -47,6 +48,9 @@ public class SweetYbEnrollServiceImpl implements ISweetYbEnrollService {
         if (param.getActivityId() == null || param.getActivityId().equals("")) {
             param.setActivityId("0");
         }
+        if (param.getAge() == null ) {
+            param.setAge(0);
+        }
         LinkedList<String> sqls = CollectionUtil.linkedListString();
         LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
         sqls.add(SqlMapping.get("sweet_yb_enroll.insert"));
@@ -54,7 +58,7 @@ public class SweetYbEnrollServiceImpl implements ISweetYbEnrollService {
                 IDGenerator.nextSnowId(), StringUtil.isEmpty(param.getContactTell()) ? "" : param.getContactTell(),
                 StringUtil.isEmpty(param.getContactWechat()) ? "" : param.getContactWechat(), param.getNickname(), param.getStyle(),
                 param.getImgUrl(), param.getAudioUrl(), StringUtil.isEmpty(param.getUniversities()) ? "" : param.getUniversities(),
-                StringUtil.isEmpty(param.getCityName()) ? "" : param.getCityName(), param.getActivityId()
+                StringUtil.isEmpty(param.getCityName()) ? "" : param.getCityName(), param.getActivityId(),param.getAge()
         });
         queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_ANSWER_INSERT.getKey(),
                 SqlMapping.gets(sqls, sqlsDataA));
@@ -69,18 +73,18 @@ public class SweetYbEnrollServiceImpl implements ISweetYbEnrollService {
         LocalDateTime now = LocalDateTime.now();
         for (String id : list) {
             SweetYbActivityVo vo = redisDataUtils.getSweetYbActivityVo(id);
-            LocalDateTime st = LocalDateTime.parse(vo.getStartTime(),DTF_YMD_HMS);
-            LocalDateTime et = LocalDateTime.parse(vo.getEndTime(),DTF_YMD_HMS);
-            if(now.isAfter(et)){
+            LocalDateTime st = LocalDateTime.parse(vo.getStartTime(), DTF_YMD_HMS);
+            LocalDateTime et = LocalDateTime.parse(vo.getEndTime(), DTF_YMD_HMS);
+            if (now.isAfter(et)) {
                 vo.setStatus(9);
-            }else if(now.isBefore(st)){
+            } else if (now.isBefore(st)) {
                 vo.setStatus(0);
-            }else{
+            } else {
                 vo.setStatus(6);
             }
             voList.add(vo);
         }
-        voList = voList.stream().sorted(Comparator.comparing(SweetYbActivityVo::getEndTime, Comparator.reverseOrder())).collect(Collectors.toList());
+        voList = voList.stream().sorted(Comparator.comparing(SweetYbActivityVo::getStatus, Comparator.naturalOrder()).thenComparing(SweetYbActivityVo::getStartTime)).collect(Collectors.toList());
         return ResponseDto.success(voList);
     }