Merge remote-tracking branch 'origin/master' into ajb_dev_zxinchain_tranfer

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/vo/GoblinGoodsAnticipateValueVo.java

 package com.liquidnet.service.goblin.dto.manage.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.goblin.dto.manage.GoblinGoodsAnticipateValueAddParam;
 import io.swagger.annotations.ApiModelProperty;
@@ -18,6 +19,7 @@ import java.time.LocalDateTime;
  * @since 2022-04-08
  */
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GoblinGoodsAnticipateValueVo implements Cloneable {
 
     private static final long serialVersionUID = 1L;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinListCollectVo.java

 package com.liquidnet.service.goblin.dto.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -8,6 +9,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GoblinListCollectVo implements Serializable, Cloneable{
     @ApiModelProperty(value = "listId")
     private String listId;

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/vo/GoblinMixDetailsVo.java

 package com.liquidnet.service.goblin.dto.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.goblin.param.GoblinMixDetailsParam;
@@ -13,6 +14,7 @@ import java.util.List;
 
 @Data
 @EqualsAndHashCode
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class GoblinMixDetailsVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 0, value = "活动id")
     private String mixId;

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java

@@ -104,4 +104,9 @@ public class SweetConstant {
 
     //AR
     public final static String REDIS_KEY_SWEET_PERFORMANCE_AR = "sweet:performance:ar";
+
+    //yb活动
+    public final static String REDIS_KEY_YB_ACTIVITY = "sweet:yb:activity:";
+    public final static String REDIS_KEY_YB_ACTIVITY_LIST = "sweet:yb:activity:list";
+
 }

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

@@ -43,4 +43,12 @@ public class SweetYbEnrollParam implements Serializable {
     @NotBlank(message = "请填写常驻城市")
     private String cityName;
 
+    @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-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/param/admin/SweetYbActivityListParam.java

+package com.liquidnet.service.sweet.dto.param.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * <p>
+ * SweetIntegralActivityListSearchParam
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-10-20
+ */
+
+@Data
+@ApiModel(value = "SweetYbActivityListParam", description = "yb活动列表")
+public class SweetYbActivityListParam implements Serializable {
+
+    private static final long serialVersionUID = 6917807562233084828L;
+
+    @ApiModelProperty(position = 11, value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
+    @ApiModelProperty(value = "页数", example = "0")
+    @NotNull(message = "页数不能为空")
+    private Integer pageSize;
+
+    @ApiModelProperty(value = "数量", example = "20")
+    @NotNull(message = "数量不能为空")
+    private Integer pageNum;
+
+}

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

+package com.liquidnet.service.sweet.dto.param.admin;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * SweetIntegralActivityListSearchParam
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-10-20
+ */
+
+@Data
+@ApiModel(value = "SweetYbActivityParam", description = "yb活动")
+public class SweetYbActivityParam implements Serializable {
+
+    private static final long serialVersionUID = 6917807562233084828L;
+
+    @ApiModelProperty(position = 11, value = "id")
+    private String activityId;
+
+    @ApiModelProperty(position = 11, value = "标题")
+    private String title;
+
+    @ApiModelProperty(position = 11, value = "封面")
+    private String cover;
+
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
+}

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/vo/SweetYbActivityVo.java

+package com.liquidnet.service.sweet.dto.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * YB报名表
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2022-07-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SweetYbActivityVo implements Serializable {
+
+    private static final long serialVersionUID = -2081186417971841992L;
+
+    @ApiModelProperty(value = "活动id")
+    private String activityId;
+
+    @ApiModelProperty(value = "活动名称")
+
+    private String title;
+
+    @ApiModelProperty(value = "封面图")
+    private String cover;
+
+    @ApiModelProperty(value = "状态[0-未开始|6-开始|7-下线|9-结束]")
+    private Integer status;
+
+    @ApiModelProperty(value = "开始时间")
+    private String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
+    @ApiModelProperty(value = "创建时间")
+    private String createdAt;
+
+    @ApiModelProperty(value = "更新时间")
+    private String updatedAt;
+
+    private static final SweetYbActivityVo obj = new SweetYbActivityVo();
+
+    public static SweetYbActivityVo getNew() {
+        try {
+            return (SweetYbActivityVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetYbActivityVo();
+        }
+    }
+
+}

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/service/ISweetYbEnrollService.java

@@ -3,8 +3,11 @@ package com.liquidnet.service.sweet.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.dto.param.SweetYbEnrollParam;
+import com.liquidnet.service.sweet.dto.vo.SweetYbActivityVo;
 import com.liquidnet.service.sweet.entity.SweetYbEnroll;
 
+import java.util.List;
+
 /**
  * <p>
  * YB报名表 服务类
@@ -13,7 +16,9 @@ import com.liquidnet.service.sweet.entity.SweetYbEnroll;
  * @author jiangxiulong
  * @since 2022-07-29
  */
-public interface ISweetYbEnrollService extends IService<SweetYbEnroll> {
+public interface ISweetYbEnrollService {
 
     ResponseDto<Boolean> create(SweetYbEnrollParam param);
+
+    ResponseDto<List<SweetYbActivityVo>> list();
 }

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

@@ -21,6 +21,7 @@ public class LocalAdminController extends BaseController
     private final String smilePrefix = "zhengzai/smile";
     private final String activityPrefix = "zhengzai/sweet";
     private final String candyPrefix = "zhengzai/candy";
+    private final String ybPrefix = "zhengzai/yb";
 
     @Value("${liquidnet.client.admin.platformUrl}")
     private String platformUrl;
@@ -221,5 +222,14 @@ public class LocalAdminController extends BaseController
     {
         return activityPrefix + "/affiliatedActivity/edit";
     }
-
+    @GetMapping("/bannerList") // yb banner列表
+    public String bannerList()
+    {
+        return ybPrefix + "/bannerList";
+    }
+    @GetMapping("/creatAndEdit") // yb banner列表
+    public String creatAndEdit(ModelMap mmap) {
+        mmap.put("platformUrl", platformUrl);
+        return ybPrefix + "/creatAndEdit";
+    }
 }

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;
+import com.liquidnet.client.admin.zhengzai.kylin.dto.OrderMemberExportVo;
+import com.liquidnet.client.admin.zhengzai.smile.service.ISmileAgentService;
+import com.liquidnet.client.admin.zhengzai.sweet.dto.SweetYbActivityExportVo;
+import com.liquidnet.client.admin.zhengzai.sweet.service.ISweetYbActivityService;
+import com.liquidnet.service.kylin.dao.PerformanceAdminListDao;
+import com.liquidnet.service.smile.entity.SmileAgent;
+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.SweetYbActivity;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-16
+ */
+@Api(tags = "YB活动管理")
+@RestController
+@RequestMapping("/sweet/activity")
+public class SweetYbActivityController extends BaseController {
+
+    @Autowired
+    ISweetYbActivityService sweetYbActivityService;
+
+    @PostMapping("/insert")
+    @ApiOperation("创建活动")
+    @ResponseBody
+    public AjaxResult aInsert(@RequestBody SweetYbActivityParam param) {
+        return sweetYbActivityService.aInsert(param);
+    }
+
+    @GetMapping("/details")
+    @ApiOperation("活动详情")
+    @ResponseBody
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "activityId", value = "活动id"),
+    })
+    public SweetYbActivityVo aDetails(String activityId) {
+        return sweetYbActivityService.aDetails(activityId);
+    }
+
+
+    @PostMapping("/update")
+    @ApiOperation("修改活动")
+    @ResponseBody
+    public AjaxResult aUpdate(@RequestBody SweetYbActivityParam param) {
+        return sweetYbActivityService.aUpdate(param);
+    }
+
+    @PostMapping("/status")
+    @ApiOperation("修改上线下")
+    @ResponseBody
+    @ApiImplicitParams({
+            @ApiImplicitParam(type = "form", required = true, dataType = "String", name = "activityId", value = "活动id"),
+            @ApiImplicitParam(type = "form", required = true, dataType = "Integer", name = "status", value = "状态[6-启用|7禁用]"),
+    })
+    public AjaxResult aStatus(String activityId, Integer status) {
+        return sweetYbActivityService.aStatus(activityId, status);
+    }
+
+    @PostMapping("/list")
+    @ApiOperation("活动列表")
+    @ResponseBody
+    public TableDataInfo aList(SweetYbActivityListParam param) {
+        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")
+    @ApiOperation("活动列表导出")
+    @ResponseBody
+    public AjaxResult exportMemberOrder(String activityId) {
+        List<SweetYbActivityExportVo> list = sweetYbActivityService.aExport(activityId);
+        if (list.size() == 0) {
+            return AjaxResult.error("查无信息");
+        }
+        ExcelUtil<SweetYbActivityExportVo> util = new ExcelUtil(SweetYbActivityExportVo.class);
+        return util.exportExcel(list, "YB报名数据");
+    }
+
+}

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

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增活动')" />
+    <th:block th:include="include :: select2-css" />
+    <th:block th:include="include :: bootstrap-fileinput-css" />
+    <link rel="stylesheet" href="">
+    <style>
+        input {
+            height: 34PX;
+            line-height: 34PX;
+        }
+        .required {
+            font-style: normal;
+            color: red;
+        }
+        .content_item {
+            padding: 20px;
+        }
+        /* .content_item .content_title {
+            display: flex;
+        } */
+        .content_item .content_title h3 span {
+            display: inline-block;
+            width: 4px;
+            height: 18px;
+            background: skyblue;
+            margin-right: 6px;
+            vertical-align: top;
+        }
+        .basis_data {
+            display: flex;
+            font-size: 14px;
+            padding: 0 20px;
+            margin-top: 20px;
+            /* align-items: center; */
+        }
+        .basis_data span {
+            width: 100px;
+            text-align: right;
+            
+        }
+        #startTime, #endTime {
+            width: 272px;
+            margin-right: 10px;
+        }
+        .storeList, #selectShow, .dropdown-menu, .input-group {
+            width: 270px !important;
+        }
+        .activityStore_item {
+            display: flex;
+            margin-bottom: 12px;
+        }
+        #basis_data {
+            align-items: flex-start;
+        }
+        .form-control,.layui-input {
+            height: 34px;
+            line-height: 34px;
+        }
+        .kv-upload-progress {
+            display: none !important;
+        }
+        .ibox-content .imgBox {
+            max-width: 350px;
+            max-height: 180px;
+        }
+    </style>
+</head>
+<body>
+<div>
+    <div class="content_item">
+        <div class="content_title">
+            <!-- <h3><span></span>基础信息</h3> -->
+        </div>
+        <div class="basis_data">
+            <span>
+                <em class="required">*</em>
+                标题：
+            </span>
+            <div class="input-group" style="width: 300px;">
+                <input type="text" class="form-control" id="ybTitle" placeholder="请输入活动名称">
+                <input type="hidden" class="form-control" id="activityId" placeholder="">
+            </div>
+        </div>
+        <div class="basis_data ibox-content" style="border: none;display: flex;">
+            <span>
+                <em class="required">*</em>
+                活动图片：
+            </span>
+            <div>
+                <img id="viewImg" class="imgBox" src="" alt="">
+                <div class="form-group">
+                    <div class="file-loading">
+                        <input id="fileinput" type="file" name="file" data-browse-on-zone-click="true" data-theme="fas">
+                        
+                    </div>
+                    <!-- <span style="color: #ccc; font-size: 12px;">适配图片尺寸：660*344</span> -->
+                </div>
+            </div>
+        </div>
+        <div class="basis_data">
+            <span>
+                <em class="required">*</em>
+                起止时间：
+            </span>
+            <input type="text" class="layui-input form-control editDisabled" id="startTime" autocomplete="off" placeholder="请选择活动开始时间">
+            ~  
+            <input type="text" class="layui-input form-control editDisabled"  id="endTime" style="margin-left: 10px;" autocomplete="off" placeholder="请选择活动结束时间">
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer" />
+<th:block th:include="include :: bootstrap-fileinput-js" />
+<th:block th:include="include :: bootstrap-suggest-js" />
+</body>
+<script th:inline="javascript">
+    let count = 1;
+    var prefix2 = ctx + "local";
+    let activityId = '';
+    let editDatas = 0;
+    var platformUrl = [[${platformUrl}]];
+    $(function() {
+        let name = 'id';
+        var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
+        var r = window.location.search.substr(1).match(reg);
+        layui.use('laydate', function(){
+            var laydate = layui.laydate;
+            //执行一个laydate实例
+            laydate.render({
+                elem: '#startTime', //指定元素
+                type: 'datetime'
+            });
+            laydate.render({
+                elem: '#endTime', //指定元素
+                type: 'datetime'
+            });
+        });
+        if (unescape(r[2]) && unescape(r[2]) != 'undefined') {
+            activityId =  unescape(r[2]);
+            let data = {
+                activityId
+            }
+            let searchActivity = promiseMethods('/sweet/activity/details', 'get', data);
+            Promise.all([searchActivity]).then(res => {
+                let data = res[0];
+                console.log(data, 'rees')
+                $("#viewImg").attr('src', data.cover);
+                $("#startTime").val(data.startTime);
+                $("#endTime").val(data.endTime);
+                $("#ybTitle").val(data.title);
+                $("#activityId").val(data.activityId);
+            })
+        }
+        $("#fileinput").fileinput({
+            'theme': 'explorer-fas',
+            'uploadUrl':  platformUrl + "/platform/basicServices/alOss/upload",
+            "uploadExtraData": {
+                "pathName" : "banner",
+                "buckType" : 1
+            },
+            autoReplace: true,
+            showCaption: false,
+            showPreview: false,
+            showRemove: false,
+            showUpload: false,
+            showCancel: false,
+            showClose: false,
+            autoReplace: true,
+            dropZoneTitle: "请上传文件",
+            maxFileCount: 1
+        }).on("filebatchselected", function (event, files) {         //默认上传
+            $(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)
+        })
+
+    })
+    function promiseMethods(url,type,data,contentType) {
+        return new Promise((resolve,reject)=>{
+            $.ajax({
+                url,
+                type,
+                data,
+                contentType,
+                success:function(res) {
+                    resolve(res);
+                }
+            })
+        })
+    }
+</script>
+</html>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/utils/SmileRedisUtils.java

@@ -31,81 +31,81 @@ public class SmileRedisUtils {
 
 
     public AbstractRedisUtil getRedis() {
-        return redisDataSourceUtil.getRedisSweetUtil();
+        return redisDataSourceUtil.getRedisKylinUtil();
     }
 
     public Object get(String key){
-        return redisDataSourceUtil.getRedisSweetUtil().get(key);
+        return redisDataSourceUtil.getRedisKylinUtil().get(key);
     }
 
     /**
      * redis保存用户
      */
     public void setSmileUserVO(String uid, SmileUserVO smileUserVO) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_USER.concat(uid), smileUserVO);
+        getRedis().set(SmileRedisConst.SMILE_USER.concat(uid), smileUserVO);
     }
 
     /**
      * redis获取SmileUserVO
      */
     public SmileUserVO getSmileUserVO(String uid) {
-        return (SmileUserVO) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_USER.concat(uid));
+        return (SmileUserVO) getRedis().get(SmileRedisConst.SMILE_USER.concat(uid));
     }
 
     /**
      * 根据学校id获取学校名称
      */
     public String getSchoolNameById(String schoolId) {
-        return (String) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
+        return (String) getRedis().get(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
     }
 
     /**
      * 根据学校id删除学校
      */
     public void delSchoolNameById(String schoolId) {
-        redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
+        getRedis().del(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
     }
 
     /**
      * 保存/更新学校
      */
     public void setSchool(String schoolId, String schoolName) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId), schoolName);
+        getRedis().set(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId), schoolName);
     }
 
     /**
      * 保存全部学校
      */
     public void setSchoolAll(List<SmileSchoolVo> smileSchoolVos) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_SCHOOL, smileSchoolVos);
+        getRedis().set(SmileRedisConst.SMILE_SCHOOL, smileSchoolVos);
     }
 
     /**
      * 删除缓存学校集合
      */
     public void delSchoolAll() {
-        redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SMILE_SCHOOL);
+        getRedis().del(SmileRedisConst.SMILE_SCHOOL);
     }
 
     /**
      * 获取全部学校
      */
     public List<SmileSchoolVo> getSchoolAll() {
-       return (List<SmileSchoolVo>)redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_SCHOOL);
+       return (List<SmileSchoolVo>)getRedis().get(SmileRedisConst.SMILE_SCHOOL);
     }
 
     /**
      * 删除学校
      */
     public void delSchool(String schoolId) {
-        redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
+        getRedis().del(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
     }
 
     /**
      * 获取演出打款状态
      */
     public String getShowStatus(String performancesId) {
-        return (String) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_SHOW.concat(performancesId));
+        return (String) getRedis().get(SmileRedisConst.SMILE_SHOW.concat(performancesId));
     }
 
 
@@ -115,7 +115,7 @@ public class SmileRedisUtils {
      */
     public void setUserDataByUid(UserData userData, String perId) {
         String key = SmileRedisConst.SELL_USER_DATA.concat(perId).concat(":").concat(userData.getUid());
-        redisDataSourceUtil.getRedisSweetUtil().set(key, userData, 60 * 60 * 24);
+        getRedis().set(key, userData, 60 * 60 * 24);
     }
 
     /**
@@ -124,7 +124,7 @@ public class SmileRedisUtils {
      */
     public UserData getUserDataByUid(String perId,String uid) {
         String key = SmileRedisConst.SELL_USER_DATA.concat(perId).concat(":").concat(uid);
-        Object obj = redisDataSourceUtil.getRedisSweetUtil().get(key);
+        Object obj = getRedis().get(key);
         if (obj==null){
             return null;
         }else {
@@ -136,7 +136,7 @@ public class SmileRedisUtils {
      * 保存演出ids
      */
     public void setShowIds(List<String> perId) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_SHOW, perId);
+        getRedis().set(SmileRedisConst.SMILE_SHOW, perId);
     }
 
     /**
@@ -177,75 +177,75 @@ public class SmileRedisUtils {
      * 保存个人打款
      */
     public void setPriceByUid(String performancesId, String uid) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid), 0);
+        getRedis().set(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid), 0);
     }
 
     /**
      * 获取个人打款状态
      */
     public Integer getShowPriceUid(String performancesId, String uid) {
-        return (Integer) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid));
+        return (Integer) getRedis().get(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid));
     }
 
     /**
      * 删除个人打款状态
      */
     public void delPriceByUid(String performancesId, String uid) {
-        redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid));
+        getRedis().del(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId).concat(uid));
     }
 
     /**
      * 总共演出打款
      */
     public void setShowPriceId(String performancesId) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId), 0);
+        getRedis().set(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId), 0);
     }
 
     /**
      * 总共演出打款删除
      */
     public void delShowPriceId(String performancesId) {
-        redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId));
+        getRedis().del(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId));
     }
 
     /**
      * 获取演出打款状态
      */
     public Integer getShowPriceId(String performancesId) {
-        return (Integer) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId));
+        return (Integer) getRedis().get(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performancesId));
     }
 
     /**
      * 获取用户数据
      */
     public SmileSellDataVO getSellDataVO(String uid, String performancesId) {
-        return (SmileSellDataVO) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_DATA.concat(uid).concat(performancesId));
+        return (SmileSellDataVO) getRedis().get(SmileRedisConst.SELL_DATA.concat(uid).concat(performancesId));
     }
 
     /**
      * 保存票提
      */
     public void setAgent(String performancesId, String ticketId, SmileAgentVo smileAgentVo) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_AGENT.concat(performancesId).concat(":").concat(ticketId), smileAgentVo);
+        getRedis().set(SmileRedisConst.SMILE_AGENT.concat(performancesId).concat(":").concat(ticketId), smileAgentVo);
     }
 
     public SmileAgentVo getAgent(String performanceId, String ticketId) {
-        return (SmileAgentVo) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_AGENT.concat(performanceId).concat(":").concat(ticketId));
+        return (SmileAgentVo) getRedis().get(SmileRedisConst.SMILE_AGENT.concat(performanceId).concat(":").concat(ticketId));
     }
 
     /**
      * 删除票提记录
      */
     public void delAgent(String performancesId, String ticketId) {
-        redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SMILE_AGENT.concat(performancesId).concat(":").concat(ticketId));
+        getRedis().del(SmileRedisConst.SMILE_AGENT.concat(performancesId).concat(":").concat(ticketId));
     }
 
     public BigDecimal getUserTotalPrice(String uid) {
-        return (redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid))) == null ? BigDecimal.valueOf(0) : (BigDecimal) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid));
+        return (getRedis().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid))) == null ? BigDecimal.valueOf(0) : (BigDecimal) getRedis().get(SmileRedisConst.SELL_USER_REVENUE.concat(uid));
     }
 
     public void setUserTotalPrice(String uid, BigDecimal add) {
-        redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_USER_REVENUE.concat(uid), add);
+        getRedis().set(SmileRedisConst.SELL_USER_REVENUE.concat(uid), add);
     }
 
     // 覆盖活动详情
@@ -325,7 +325,7 @@ public class SmileRedisUtils {
      */
     public void setShowVoByPerId(ShowVo vo) {
         String key = SmileRedisConst.SELL_SHOW_SAVE.concat(vo.getPerformancesId());
-        redisDataSourceUtil.getRedisSweetUtil().set(key,vo);
+        getRedis().set(key,vo);
     }
     /**
      * 获取演出列表vo
@@ -333,7 +333,7 @@ public class SmileRedisUtils {
      */
     public ShowVo getShowVoByPerId(String perId) {
         String key = SmileRedisConst.SELL_SHOW_SAVE.concat(perId);
-        Object o = redisDataSourceUtil.getRedisSweetUtil().get(key);
+        Object o = getRedis().get(key);
         if (o==null){
             return null;
         }else {

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

+package com.liquidnet.client.admin.zhengzai.sweet.dto;
+
+import com.liquidnet.client.admin.common.annotation.Excel;
+import com.liquidnet.service.kylin.dao.OrderExportDao;
+import com.liquidnet.service.sweet.entity.SweetYbActivity;
+import com.liquidnet.service.sweet.entity.SweetYbEnroll;
+import lombok.Data;
+
+import java.io.Serializable;
+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)
+    private String imgUrl;
+    @Excel(name = "音频文件地址", cellType = Excel.ColumnType.STRING)
+    private String audioUrl;
+    @Excel(name = "院校", cellType = Excel.ColumnType.STRING)
+    private String universities;
+    @Excel(name = "常驻城市名称", cellType = Excel.ColumnType.STRING)
+    private String cityName;
+    @Excel(name = "创建时间", cellType = Excel.ColumnType.STRING)
+    private String createdAt;
+
+
+    private static final SweetYbActivityExportVo obj = new SweetYbActivityExportVo();
+
+    public static SweetYbActivityExportVo getNew() {
+        try {
+            return (SweetYbActivityExportVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            e.printStackTrace();
+        }
+        return new SweetYbActivityExportVo();
+    }
+
+    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());
+        this.setStyle(source.getStyle());
+        this.setImgUrl(source.getImgUrl());
+        this.setAudioUrl(source.getAudioUrl());
+        this.setUniversities(getUniversities());
+        this.setCityName(source.getCityName());
+        this.setUniversities(source.getUniversities());
+        this.setCreatedAt(source.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        return this;
+    }
+
+}

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

+package com.liquidnet.client.admin.zhengzai.sweet.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.zhengzai.sweet.dto.SweetYbActivityExportVo;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.sweet.dto.SweetIntegralActivityDto;
+import com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityFromParam;
+import com.liquidnet.service.sweet.dto.param.admin.SweetIntegralActivityListSearchParam;
+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.dto.vo.admin.SweetIntegralActivityVo;
+import com.liquidnet.service.sweet.entity.SweetIntegralActivity;
+import com.liquidnet.service.sweet.entity.SweetYbActivity;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 积分活动表 服务类
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2021-10-20
+ */
+public interface ISweetYbActivityService  {
+
+    AjaxResult aInsert(SweetYbActivityParam param);
+
+    SweetYbActivityVo aDetails(String activityId);
+
+    List<SweetYbActivity> aList(SweetYbActivityListParam param);
+
+    AjaxResult aUpdate(SweetYbActivityParam param);
+
+    AjaxResult aStatus(String activityId, Integer status);
+
+    List<SweetYbActivityExportVo> aExport(String activityId);
+
+}

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.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.common.exception.BusinessException;
+import com.liquidnet.client.admin.zhengzai.sweet.dto.SweetYbActivityExportVo;
+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.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.SweetYbActivity;
+import com.liquidnet.service.sweet.entity.SweetYbEnroll;
+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.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+
+import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
+
+
+@Service
+@Slf4j
+public class SweetYbActivityServiceImpl implements ISweetYbActivityService {
+
+    @Autowired
+    SweetRedisAdminUtils sweetRedisAdminUtils;
+    @Autowired
+    SweetYbActivityMapper sweetYbActivityMapper;
+    @Autowired
+    SweetYbEnrollMapper sweetYbEnrollMapper;
+
+    @Override
+    public AjaxResult aInsert(SweetYbActivityParam param) {
+        LocalDateTime now = LocalDateTime.now();
+        SweetYbActivity entity = SweetYbActivity.getNew();
+        entity.setActivityId(IDGenerator.nextTimeId2());
+        entity.setCover(param.getCover());
+        entity.setTitle(param.getTitle());
+        entity.setStartTime(LocalDateTime.parse(param.getStartTime(), DTF_YMD_HMS));
+        entity.setEndTime(LocalDateTime.parse(param.getEndTime(), DTF_YMD_HMS));
+        entity.setStatus(7);
+        entity.setCreatedAt(now);
+        entity.setUpdatedAt(now);
+        int i = sweetYbActivityMapper.insert(entity);
+        if (i > 0) {
+            SweetYbActivityVo vo = SweetYbActivityVo.getNew();
+            vo.setCreatedAt(DateUtil.getNowTime());
+            vo.setCover(entity.getCover());
+            vo.setTitle(entity.getTitle());
+            vo.setActivityId(entity.getActivityId());
+            vo.setStartTime(entity.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            vo.setEndTime(entity.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            sweetRedisAdminUtils.setSweetYbActivityVo(vo);
+            return AjaxResult.success("添加成功");
+        }
+        return AjaxResult.error("添加失败");
+    }
+
+    @Override
+    public SweetYbActivityVo aDetails(String activityId) {
+        SweetYbActivity entity = sweetYbActivityMapper.selectOne(Wrappers.lambdaQuery(SweetYbActivity.class).eq(SweetYbActivity::getActivityId, activityId));
+
+        return initVo(entity);
+    }
+
+    @Override
+    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
+    public AjaxResult aUpdate(SweetYbActivityParam param) {
+        int count = sweetYbActivityMapper.selectCount(Wrappers.lambdaQuery(SweetYbActivity.class).ne(SweetYbActivity::getActivityId, param.getActivityId()).eq(SweetYbActivity::getTitle, param.getTitle()));
+        if (count > 0) {
+            return AjaxResult.error("活动名称重复");
+        }
+        LocalDateTime now = LocalDateTime.now();
+        SweetYbActivity entity = SweetYbActivity.getNew();
+        entity.setCover(param.getCover());
+        entity.setTitle(param.getTitle());
+        entity.setStartTime(LocalDateTime.parse(param.getStartTime(), DTF_YMD_HMS));
+        entity.setEndTime(LocalDateTime.parse(param.getEndTime(), DTF_YMD_HMS));
+        entity.setUpdatedAt(now);
+        int i = sweetYbActivityMapper.update(entity, Wrappers.lambdaUpdate(SweetYbActivity.class).eq(SweetYbActivity::getActivityId, param.getActivityId()));
+        if (i > 0) {
+            SweetYbActivityVo vo = sweetRedisAdminUtils.getSweetYbActivityVo(param.getActivityId());
+            vo.setUpdatedAt(DateUtil.getNowTime());
+            vo.setCover(entity.getCover());
+            vo.setTitle(entity.getTitle());
+            vo.setStartTime(entity.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            vo.setEndTime(entity.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+            sweetRedisAdminUtils.setSweetYbActivityVo(vo);
+            return AjaxResult.success("修改成功");
+        }
+        return AjaxResult.error("修改失败");
+    }
+
+    @Override
+    public AjaxResult aStatus(String activityId, Integer status) {
+        if (status != 6 && status != 7) {
+            return AjaxResult.error("修改失败");
+        }
+        SweetYbActivity entity = SweetYbActivity.getNew();
+        entity.setStatus(status);
+        SweetYbActivityVo vo = sweetRedisAdminUtils.getSweetYbActivityVo(activityId);
+//        if(vo.getStatus().equals(status)){
+//            return AjaxResult.error("已修改");
+//        }
+        int i = sweetYbActivityMapper.update(entity, Wrappers.lambdaUpdate(SweetYbActivity.class).eq(SweetYbActivity::getActivityId, activityId));
+        if (i > 0) {
+            vo.setStatus(status);
+            sweetRedisAdminUtils.setSweetYbActivityVo(vo);
+            if (status == 6) {
+                sweetRedisAdminUtils.addSweetYbActivityList(activityId);
+            } else {
+                sweetRedisAdminUtils.removeSweetYbActivityList(activityId);
+            }
+            return AjaxResult.success("修改成功");
+        }
+        return AjaxResult.error("修改失败");
+    }
+
+    @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, activity.getTitle()));
+            }
+            return voList;
+        } catch (Exception e) {
+            e.printStackTrace();
+            throw new BusinessException("导出异常，请联系网站管理员！");
+        }
+    }
+
+    private SweetYbActivityVo initVo(SweetYbActivity entity) {
+        LocalDateTime now = LocalDateTime.now();
+        SweetYbActivityVo vo = SweetYbActivityVo.getNew();
+        vo.setActivityId(entity.getActivityId());
+        vo.setCreatedAt(entity.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        vo.setEndTime(entity.getEndTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        vo.setStartTime(entity.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        vo.setTitle(entity.getTitle());
+        vo.setCover(entity.getCover());
+        if (entity.getStatus() == 6) {
+            if (now.isBefore(entity.getStartTime())) {
+                vo.setStatus(0);
+            } else if (now.isAfter(entity.getEndTime())) {
+                vo.setStatus(9);
+            } else {
+                vo.setStatus(6);
+            }
+        } else {
+            vo.setStatus(entity.getStatus());
+        }
+        return vo;
+    }
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/sweet/utils/SweetRedisAdminUtils.java

 package com.liquidnet.client.admin.zhengzai.sweet.utils;
 
 import com.liquidnet.common.cache.redis.util.RedisDataSourceUtil;
+import com.liquidnet.commons.lang.util.CollectionUtil;
+import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.service.sweet.constant.SweetConstant;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityDrawVo;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityVo;
+import com.liquidnet.service.sweet.dto.vo.SweetYbActivityVo;
 import com.liquidnet.service.sweet.entity.SweetQrCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.Currency;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -150,4 +154,50 @@ public class SweetRedisAdminUtils {
         String redisKey = SweetConstant.REDIS_KEY_QRCODE_LIST.concat(type + "");
         redisDataSourceUtil.getRedisSweetUtil().set(redisKey, data);
     }
+
+    //yb活动vo
+    public void setSweetYbActivityVo(SweetYbActivityVo vo) {
+        String redisKey = SweetConstant.REDIS_KEY_YB_ACTIVITY.concat(vo.getActivityId());
+        redisDataSourceUtil.getRedisSweetUtil().set(redisKey, vo);
+    }
+
+    //yb活动vo
+    public SweetYbActivityVo getSweetYbActivityVo(String activityId) {
+        String redisKey = SweetConstant.REDIS_KEY_YB_ACTIVITY.concat(activityId);
+        Object obj = redisDataSourceUtil.getRedisSweetUtil().get(redisKey);
+        if (obj == null) {
+            return SweetYbActivityVo.getNew();
+        } else {
+            return (SweetYbActivityVo) obj;
+        }
+    }
+
+    //yb活动vo
+    public List<String> getSweetYbActivityList() {
+        String redisKey = SweetConstant.REDIS_KEY_YB_ACTIVITY_LIST;
+        Object obj = redisDataSourceUtil.getRedisSweetUtil().get(redisKey);
+        if (obj == null) {
+            return CollectionUtil.arrayListString();
+        } else {
+            return (List<String>) obj;
+        }
+    }
+
+    //yb活动vo
+    public void addSweetYbActivityList(String activityId) {
+        String redisKey = SweetConstant.REDIS_KEY_YB_ACTIVITY_LIST;
+        List<String> list = getSweetYbActivityList();
+        if(!list.contains(activityId)) {
+            list.add(activityId);
+        }
+        redisDataSourceUtil.getRedisSweetUtil().set(redisKey,list);
+    }
+
+    //yb活动vo
+    public void removeSweetYbActivityList(String activityId) {
+        String redisKey = SweetConstant.REDIS_KEY_YB_ACTIVITY_LIST;
+        List<String> list = getSweetYbActivityList();
+        list.remove(activityId);
+        redisDataSourceUtil.getRedisSweetUtil().set(redisKey,list);
+    }
 }

liquidnet-bus-do/liquidnet-service-candy-do/src/main/resources/com/liquidnet/service/candy/mapper/CandyCommonCouponMapper.xml

@@ -54,7 +54,7 @@
         <include refid="Rst_CommonCouponBasicDto_Column_List"/>
         FROM candy_common_coupon ccc
         LEFT JOIN candy_coupon cc ON ccc.coupon_id = cc.coupon_id
-        WHERE ccc.state <![CDATA[<>]]> 2
+        WHERE ccc.state in (1,3)
         AND ccc.created_at <![CDATA[>=]]> #{ucreatedAt,jdbcType=TIMESTAMP}
     </select>
 </mapper>

liquidnet-bus-do/liquidnet-service-candy-do/src/main/resources/com/liquidnet/service/candy/mapper/CandyUserCouponMapper.xml

@@ -56,7 +56,7 @@
         <include refid="Rst_UserCouponBasicDto_Column_List"/>
         FROM candy_user_coupon cuc
         LEFT JOIN candy_coupon cc ON cuc.coupon_id = cc.coupon_id
-        WHERE cuc.state <![CDATA[<>]]> 2
+        WHERE cuc.state in (1,3,5)
         AND cuc.uid = #{uid,jdbcType=VARCHAR}
     </select>
 </mapper>

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

+package com.liquidnet.service.sweet.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * YB报名表
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2022-07-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SweetYbActivity implements Serializable {
+
+    private static final long serialVersionUID = -2081186417971841992L;
+
+    @TableId(value = "mid", type = IdType.AUTO)
+    private Long mid;
+
+    /**
+     * 活动id
+     */
+    private String activityId;
+
+    /**
+     * 活动名称
+     */
+    private String title;
+
+    /**
+     * 封面图
+     */
+    private String cover;
+
+    /**
+     * 状态[0-未开始|6-开始|7-下线|9-结束]
+     */
+    private Integer status;
+
+    /**
+     * 开始时间
+     */
+    private LocalDateTime startTime;
+
+    /**
+     * 结束时间
+     */
+    private LocalDateTime endTime;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedAt;
+
+    private static final SweetYbActivity obj = new SweetYbActivity();
+
+    public static SweetYbActivity getNew() {
+        try {
+            return (SweetYbActivity) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SweetYbActivity();
+        }
+    }
+
+}

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

@@ -70,6 +70,16 @@ public class SweetYbEnroll implements Serializable {
      */
     private String cityName;
 
+    /**
+     * 平均年龄
+     */
+    private int age;
+
+    /**
+     * 活动id
+     */
+    private String activityId;
+
     /**
      * 创建时间
      */

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/mapper/SweetYbActivityMapper.java

+package com.liquidnet.service.sweet.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.sweet.dto.SweetManualAppletFiveDto;
+import com.liquidnet.service.sweet.dto.SweetManualFiveDto;
+import com.liquidnet.service.sweet.entity.SweetManualFive;
+import com.liquidnet.service.sweet.entity.SweetYbActivity;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-08-09
+ */
+public interface SweetYbActivityMapper extends BaseMapper<SweetYbActivity> {
+
+}

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetYbActivityMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.sweet.mapper.SweetYbActivityMapper">
+
+</mapper>

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinStoreZhengzaiServiceImpl.java

@@ -71,7 +71,16 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi
         if (storeInfoVo == null) {
             return ResponseDto.failure("店铺不存在");
         }
+        GoblinSelfMarketingVo marketingVo = redisUtils.getSelfMarket(marketId);
+        if (marketingVo.getStatus() == 7) {
+            return ResponseDto.failure("活动已停用");
+        }
+        //todo
         String storeId = storeInfoVo.getStoreId();
+        GoblinMarketingZhengzaiRelationVo marketingZhengzaiRelationVo = redisUtils.getZhengzaiRelation(marketId, storeId);
+        if (marketingZhengzaiRelationVo == null) {
+            return ResponseDto.failure("未参加活动");
+        }
         List<GoblinMarketRelationVo> relationVo = redisUtils.getMarketRelation(GoblinStatusConst.MarketPreStatus.MARKET_PRE_ZHENGZAI.getValue(), marketId);
         List<String> spuIdList = relationVo.stream().map(GoblinMarketRelationVo::getSpuId).collect(Collectors.toList());
         List<GoblinZhengzaiGoodVo> voList = ObjectUtil.getGoblinZhengzaiGoodVoArrayList();
@@ -124,7 +133,7 @@ public class GoblinStoreZhengzaiServiceImpl implements IGoblinStoreZhengzaiServi
                 //redis
                 redisUtils.setGoblinOrder(storeOrderVo.getOrderId(), storeOrderVo);
                 sqlDataOrder.add(new Object[]{
-                        storeOrderVo.getZhengzaiStatus(),storeOrderVo.getStatus(), now, storeOrderVo.getOrderId(), now, now
+                        storeOrderVo.getZhengzaiStatus(), storeOrderVo.getStatus(), now, storeOrderVo.getOrderId(), now, now
                 });
             }
             //mysql

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/GoblinOrderServiceImpl.java

@@ -485,12 +485,22 @@ public class GoblinOrderServiceImpl implements IGoblinOrderService {
             payInnerResultVo.setPrice(BigDecimal.valueOf(0));
             payInnerResultVo.setPayType(preParam.getPayType());
         } else if (preParam.getPayType().equals("huifu")) {
-            isFree = true;
-            preParam.setPayType("huifu");
-            payCode = "HUIFU_PAY_CODE";
+//            isFree = true;
+//            preParam.setPayType("huifu");
+//            payCode = "HUIFU_PAY_CODE";
+//            payInnerResultVo = GoblinPayInnerResultVo.getNew();
+//            payInnerResultVo.setPrice(preParam.getPriceActual());
+//            payInnerResultVo.setPayType(preParam.getPayType());
             payInnerResultVo = GoblinPayInnerResultVo.getNew();
-            payInnerResultVo.setPrice(preParam.getPriceActual());
+            payInnerResultVo.setCode("HUIFU_PAY_CODE");
+            payInnerResultVo.setOrderCode(preParam.getOrderMasterCode());
+            payInnerResultVo.setPayData(null);
             payInnerResultVo.setPayType(preParam.getPayType());
+            payInnerResultVo.setPrice(preParam.getPriceActual());
+            payInnerResultVo.setMsg("汇付支付");
+            payCode = payInnerResultVo.getCode();
+            payInnerResultVo.setShowUrl(preParam.getShowUrl());
+            payInnerResultVo.setReturnUrl(preParam.getReturnUrl());
         } else {
             isFree = true;
             preParam.setPayType("FREE");

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/service/impl/MixOrderServiceImpl.java

@@ -129,7 +129,7 @@ public class MixOrderServiceImpl implements IMixOrderService {
                         initStock(canBuyIds, mixId, isUseLimit, uid);
                         return ResponseDto.failure("该商品SPU不存在～");
                     } else {
-                        GoblinGoodsSkuInfoVo boxSkuInfo = nftOrderUtils.lotteryDraw(skuIdList, itemVo.getCount(), nt, mixId);
+                        GoblinGoodsSkuInfoVo boxSkuInfo = nftOrderUtils.lotteryDrawUnStatus(skuIdList, itemVo.getCount(), nt, mixId);
                         if (null == boxSkuInfo) {
                             return ResponseDto.failure("库存不足啦～");
                         } else {

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/GoblinNftOrderUtils.java

@@ -488,6 +488,37 @@ public class GoblinNftOrderUtils {
         }
     }
 
+    // 获取盲盒下藏品的库存 各种状态下不能算库存的排除掉 不考虑状态
+    public int getSkuAllStatusStockUnStatus(String listId, GoblinGoodsSkuInfoVo info) {
+        if (
+                info != null
+                        && (null == info.getHitRatio() || info.getHitRatio().compareTo(BigDecimal.ZERO) > 0)
+        ) {// 可以返回库存
+            // 外面只有盲盒才能请求进来 里面只有不是分批购才判断盲盒里藏品的开售时间
+            if (null == listId) {
+                return goblinRedisUtils.getSkuStock(listId, info.getSkuId());
+            } else {
+                return goblinRedisUtils.getSkuStock(listId, info.getSkuId());
+            }
+        } else {// 不计入库存
+            return 0;
+        }
+    }
+
+    //不考虑状态
+    public boolean getSkuAllStatusShowUnStatus(GoblinGoodsSkuInfoVo info) {
+        if (
+                info != null
+                        && info.getSkuType() == 1
+                        && info.getDelFlg().equals("0")
+                        && ((info.getUnbox().equals("0") && info.getUpchain() == 1) || info.getUnbox().equals("1"))
+        ) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     public GoblinGoodsSkuInfoVo lotteryDraw(List<String> skuIdList, int number, LocalDateTime nowTime, String listId) {
 //    private HashMap<String, Object> lotteryDraw(List<String> skuIdList, int number, LocalDateTime nowTime) {
         try {
@@ -578,7 +609,112 @@ public class GoblinNftOrderUtils {
 //                String endListId = newListIds.get(index);
                 // 判断库存
                 int surplusGeneral = goblinRedisUtils.decrSkuStock(listId, goodsSkuInfoVo.getSkuId(), number);
-                log.error("剩余 skuId = "+surplusGeneral);
+                log.error("剩余 skuId = " + surplusGeneral);
+                if (surplusGeneral < 0) {
+                    goblinRedisUtils.incrSkuStock(listId, goodsSkuInfoVo.getSkuId(), number);
+                    return lotteryDraw(skuIdList, number, nowTime, listId);
+                } else {
+//                    HashMap<String, Object> map = CollectionUtil.mapStringObject();
+//                    map.put("goodsSkuInfoVo", goodsSkuInfoVo);
+//                    map.put("listId", endListId);
+//                    return map;
+                    return goodsSkuInfoVo;
+                }
+            }
+        } catch (Exception e) {
+            log.error("NFT下单-抽盲盒异常", e);
+            return null;
+        }
+    }
+
+    // 不判断状态
+    public GoblinGoodsSkuInfoVo lotteryDrawUnStatus(List<String> skuIdList, int number, LocalDateTime nowTime, String listId) {
+        try {
+            ArrayList<GoblinGoodsSkuInfoVo> skuInfoVos = ObjectUtil.cloneArrayGoblinGoodsSkuInfoListVo();
+            for (String kid : skuIdList) {
+                HashMap<String, Object> map = goblinRedisUtils.getGoodsSkuInfoVo(nowTime, kid);
+                GoblinGoodsSkuInfoVo skuInfoVo = (GoblinGoodsSkuInfoVo) map.get("vo");
+                // 是盲盒的扔掉
+                if (skuInfoVo.getUnbox().equals("1")) {
+                    continue;
+                }
+                // 不能购买的 没库存的 概率是0的 过滤
+                if (getSkuAllStatusShowUnStatus(skuInfoVo) && getSkuAllStatusStockUnStatus(listId, skuInfoVo) > 0) {
+                    skuInfoVos.add(skuInfoVo);
+                }
+            }
+            if (CollectionUtil.isEmpty(skuInfoVos)) {
+                return null;
+            } else {
+                // 计算总概率 和 剩余没填概率的平均概率
+                int size = 0;
+                BigDecimal sumHitRatio = BigDecimal.ZERO;
+                for (GoblinGoodsSkuInfoVo skuInfoVo : skuInfoVos) {
+                    if (null == skuInfoVo.getHitRatio()) {
+                        size++;
+                    } else {
+                        sumHitRatio = sumHitRatio.add(skuInfoVo.getHitRatio());
+                    }
+                }
+                /**
+                 * 剔除掉没库存的商品再去算未设置概率商品的平均概率 会导致未设置概率的商品的概率增加
+                 * 如果不剔除掉没库存的商品去算未设置概率商品的平均概率 会导致总概率小于100 如果随机数还是0-100的话就有可能会中奖溢出
+                 * 想保持概率 1.不剔除无库存商品算平均概率 2.随机数最大值为排序后概率的最后一个值
+                 */
+                BigDecimal avgHitRatio = BigDecimal.ZERO;
+                if (size > 0) {// 说明有未设置抽奖概率的
+                    avgHitRatio = new BigDecimal(100).subtract(sumHitRatio).divide(new BigDecimal(size), 2, RoundingMode.HALF_UP);
+                }
+
+                // 未设置概率的写入概率
+                ArrayList<GoblinGoodsSkuInfoVo> newSkuInfoVos = ObjectUtil.cloneArrayGoblinGoodsSkuInfoListVo();
+//                ArrayList<String> newListIds = ObjectUtil.cloneArrayListString();
+                int skuListSize = skuInfoVos.size();
+                for (int i = 0; i < skuListSize; i++) {
+                    GoblinGoodsSkuInfoVo infoVo = skuInfoVos.get(i);
+                    if (null == infoVo.getHitRatio() || infoVo.getHitRatio().compareTo(BigDecimal.ZERO) < 0) {
+                        /**
+                         * 算所得平均概率是0 即中不了 剔除掉
+                         * 但是这么处理会导致前端页面显示有库存 买的时候显示没有
+                         * 所以要么概率加起来必须100 要么前端计算盲盒总概率的时候也要同样处理
+                         */
+                        if (avgHitRatio.compareTo(BigDecimal.ZERO) <= 0) {
+                            continue;
+                        } else {
+                            infoVo.setHitRatio(avgHitRatio);
+                        }
+                    }
+                    // 等于0的最终概率就是设置的值 大于0最终的概率是自己的+上面的
+                    if (i > 0) {
+                        infoVo.setHitRatio(skuInfoVos.get(i - 1).getHitRatio().add(infoVo.getHitRatio()));
+                    }
+                    newSkuInfoVos.add(infoVo);
+//                    newListIds.add(listIds.get(i));
+                }
+
+
+                if (CollectionUtil.isEmpty(newSkuInfoVos)) {
+                    log.info("该盲盒概率超过100导致不能卖 skuIdList:{}", skuIdList);
+                    return null;
+                }
+                // 按照概率排序 按照上面的运算最后一定是最大的不用排序了
+//                List<GoblinGoodsSkuInfoVo> listSort = newSkuInfoVos.stream().sorted(Comparator.comparing(GoblinGoodsSkuInfoVo::getHitRatio)).collect(Collectors.toList());
+                List<BigDecimal> hitRatioList = newSkuInfoVos.stream().map(GoblinGoodsSkuInfoVo::getHitRatio).collect(Collectors.toList());
+                // 根据区块值来获取抽取到的物品索引
+                double nextDouble = Math.random();
+                BigDecimal nextDoubleNew = BigDecimal.valueOf(nextDouble);
+                nextDoubleNew = nextDoubleNew.multiply(hitRatioList.get(hitRatioList.size() - 1)).setScale(4, RoundingMode.HALF_UP);
+
+                hitRatioList.add(nextDoubleNew);
+                Collections.sort(hitRatioList);
+
+                int index = hitRatioList.indexOf(nextDoubleNew);
+
+                GoblinGoodsSkuInfoVo goodsSkuInfoVo = newSkuInfoVos.get(index);
+//                String endListId = newListIds.get(index);
+                // 判断库存
+                int surplusGeneral = goblinRedisUtils.decrSkuStock(listId, goodsSkuInfoVo.getSkuId(), number);
+                log.error("剩余 skuId = " + surplusGeneral);
                 if (surplusGeneral < 0) {
                     goblinRedisUtils.incrSkuStock(listId, goodsSkuInfoVo.getSkuId(), number);
                     return lotteryDraw(skuIdList, number, nowTime, listId);

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/candy/PlatformCandyCommonCouponService.java

@@ -45,7 +45,7 @@ public class PlatformCandyCommonCouponService extends ServiceImpl<CandyCommonCou
             int totalCount = this.count(commonCouponQueryWrapper);
             int remainCount = totalCount, pSize = 1000;
             if (totalCount > 0) {
-                log.info("券移除处理:公有券[总数:{},AT:{} - {} = {}] >>> BEGIN BEGIN BEGIN", totalCount, currentDateTime, displayDays, currentDateTime.minusDays(displayDays));
+                log.info("券移除处理:公有券[总数:{},AT:{} - {} = {}] >>> BEGIN BEGIN BEGIN", totalCount, currentDateTime, displayDays, currentDateTime.minusSeconds(displayDays));
             }
 
             ArrayList<CandyCommonCoupon> updateCommonCouponList = ObjectUtil.getCandyCommonCouponArrayList();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/candy/PlatformCandyUserCouponService.java

@@ -141,7 +141,7 @@ public class PlatformCandyUserCouponService extends ServiceImpl<CandyUserCouponM
             int totalCount = this.count(userCouponQueryWrapper);
             int remainCount = totalCount, pSize = 1000;
             if (totalCount > 0) {
-                log.info("券移除处理:私有券[总数:{},AT:{} - {} = {}] >>> BEGIN BEGIN BEGIN", totalCount, currentDateTime, displayDays, currentDateTime.minusDays(displayDays));
+                log.info("券移除处理:私有券[总数:{},AT:{} - {} = {}] >>> BEGIN BEGIN BEGIN", totalCount, currentDateTime, displayDays, currentDateTime.minusSeconds(displayDays));
             }
 
             ArrayList<CandyUserCoupon> updateUserCouponList = ObjectUtil.getCandyUserCouponArrayList();

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/smile/SellDataInfoImpl.java

@@ -79,7 +79,7 @@ public class SellDataInfoImpl {
                         String performanceId=a.get("yanchuId")==null?"":a.get("yanchuId").toString();
                         String yanChuName=a.get("title")==null?"":a.get("title").toString();
                             //判断是否 已经跑过一遍了
-                        if(redisDataSourceUtil.getRedisSweetUtil().hasKey(SmileRedisConst.SELL_SHOW_PAYMENT_ENDJOB.concat(performanceId).concat(smileUser.getUid()))){
+                        if(redisDataSourceUtil.getRedisKylinUtil().hasKey(SmileRedisConst.SELL_SHOW_PAYMENT_ENDJOB.concat(performanceId).concat(smileUser.getUid()))){
                             continue;
                         }
                         //获取 该人 该演出 的所有订单
@@ -121,7 +121,7 @@ public class SellDataInfoImpl {
                             smileSellDataVO.setSellDataOneVO(listSellDataOneVo);
                             smileSellDataVO.setUpdateTime(LocalDateTime.now());
                             //redis 里面放入
-                            redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_DATA.concat(smileUser.getUid()).concat(performanceId), smileSellDataVO);
+                            redisDataSourceUtil.getRedisKylinUtil().set(SmileRedisConst.SELL_DATA.concat(smileUser.getUid()).concat(performanceId), smileSellDataVO);
                             Query query = Query.query(Criteria.where("sellDataId").is(smileSellDataVO.getSellDataId()));
                             Document document = (Document)mongoConverter.convertToMongoType(smileSellDataVO);
                             Update update = Update.fromDocument(document);
@@ -133,8 +133,8 @@ public class SellDataInfoImpl {
                             //mongodb 里面放入
                             mongoTemplate.insert(smileSellDataVO, SmileSellDataVO.class.getSimpleName());*/
                         }
-                        if(redisDataSourceUtil.getRedisSweetUtil().hasKey(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performanceId).concat(smileUser.getUid()))){
-                            redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_SHOW_PAYMENT_ENDJOB.concat(performanceId).concat(smileUser.getUid()),"1");
+                        if(redisDataSourceUtil.getRedisKylinUtil().hasKey(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performanceId).concat(smileUser.getUid()))){
+                            redisDataSourceUtil.getRedisKylinUtil().set(SmileRedisConst.SELL_SHOW_PAYMENT_ENDJOB.concat(performanceId).concat(smileUser.getUid()),"1");
                         }
                     }
 
@@ -178,7 +178,7 @@ public class SellDataInfoImpl {
                for(Map a: userPerformanceList){
                     //取出id 查看是否结算
                    String performanceId= a.get("performanceId")==null?"":a.get("performanceId").toString();
-                   if(redisDataSourceUtil.getRedisSweetUtil().hasKey(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performanceId).concat(smileUser.getUid()))){
+                   if(redisDataSourceUtil.getRedisKylinUtil().hasKey(SmileRedisConst.SELL_SHOW_PAYMENT.concat(performanceId).concat(smileUser.getUid()))){
                        //已结算（已完成）
                        a.put("status","3");
                    }else{
@@ -202,8 +202,8 @@ public class SellDataInfoImpl {
                //待入账
                commissionVO.setDaiRuZhang(daiRuZhang);
                commissionVO.setKeJieSuan(keJieSuan);
-               commissionVO.setZongYingShou((BigDecimal) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SELL_USER_REVENUE.concat(smileUser.getUid())));
-               redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SELL_DATA_COMMISSION.concat(smileUser.getUid()),commissionVO);
+               commissionVO.setZongYingShou((BigDecimal) redisDataSourceUtil.getRedisKylinUtil().get(SmileRedisConst.SELL_USER_REVENUE.concat(smileUser.getUid())));
+               redisDataSourceUtil.getRedisKylinUtil().set(SmileRedisConst.SELL_DATA_COMMISSION.concat(smileUser.getUid()),commissionVO);
            }
        }
    }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/utils/DataUtils.java

@@ -57,10 +57,10 @@ public class DataUtils {
     //获取场地redis
     public SlimeFieldsVo getFieldVo(String fieldId) {
         String key = SlimeRedisConst.INFO_FIELD.concat(fieldId);
-        SlimeFieldsVo vo = (SlimeFieldsVo) redisDataSourceUtil.getRedisSweetUtil().get(key);
+        SlimeFieldsVo vo = (SlimeFieldsVo) redisDataSourceUtil.getRedisKylinUtil().get(key);
         if (null == vo) {
             vo = mongoTemplate.findOne(Query.query(Criteria.where("fieldId").is(fieldId)), SlimeFieldsVo.class, SlimeFieldsVo.class.getSimpleName());
-            redisDataSourceUtil.getRedisSweetUtil().set(key, vo);
+            redisDataSourceUtil.getRedisKylinUtil().set(key, vo);
         }
         return vo;
     }

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

@@ -510,6 +510,28 @@ CREATE TABLE `sweet_yb_enroll`
   ROW_FORMAT = DYNAMIC COMMENT 'YB报名表';
 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`;
+CREATE TABLE `sweet_yb_activity`
+(
+    `mid`         bigint unsigned NOT NULL AUTO_INCREMENT primary key,
+    `activity_id` varchar(255)    NOT NULL DEFAULT '' COMMENT '活动id',
+    `title`       varchar(30)     NOT NULL DEFAULT '' COMMENT '活动名称',
+    `status`      int             NOT NULL DEFAULT 7 COMMENT '状态[0-未开始|6-开始|7-下线|9-结束]',
+    `start_time`  datetime        NOT NULL  COMMENT '开始时间',
+    `end_time`    datetime        NOT NULL  COMMENT '结束时间',
+    `created_at`  datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `updated_at`  datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',
+    KEY `sweet_yb_activity_id` (`activity_id`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET utf8mb4
+  COLLATE utf8mb4_unicode_ci
+  ROW_FORMAT = DYNAMIC COMMENT 'YB活动表';
 
 -- 城市投票表
 drop TABLE if exists `sweet_city_vote`;

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/SweetYbEnrollController.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.sweet.controller;
 
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.sweet.dto.param.SweetYbEnrollParam;
+import com.liquidnet.service.sweet.dto.vo.SweetYbActivityVo;
 import com.liquidnet.service.sweet.service.ISweetYbEnrollService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -36,4 +38,9 @@ public class SweetYbEnrollController {
         return iSweetYbEnrollService.create(param);
     }
 
+    @PostMapping("activityList")
+    @ApiOperation("活动列表")
+    public ResponseDto<List<SweetYbActivityVo>> list() {
+        return iSweetYbEnrollService.list();
+    }
 }

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

@@ -21,6 +21,7 @@ import com.liquidnet.service.sweet.utils.QueueUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
 
@@ -45,6 +46,7 @@ public class SweetAppletSubMsgServiceImpl extends ServiceImpl<SweetAppletSubMsgM
     private SweetAppletSubMsgMapper subMsgMapper;
 
     @Autowired
+    @Lazy
     private FeignKylinPerformancesClient feignKylinPerformancesClient;
 
     @Autowired

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

@@ -26,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.bson.Document;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -62,10 +63,13 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
     private QueueUtils queueUtils;
 
     @Autowired
+    @Lazy
     private FeignStoneIntegralClient feignStoneIntegralClient;
     @Autowired
+    @Lazy
     private FeignAdamBaseClient feignAdamBaseClient;
     @Autowired
+    @Lazy
     private FeignCandyBaseClient feignCandyBaseClient;
 
     @Override

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

@@ -24,6 +24,7 @@ import me.chanjar.weixin.common.bean.WxOAuth2UserInfo;
 import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
@@ -54,6 +55,7 @@ public class SweetWechatLoginServiceImpl {
     private WechatUsersRedisUtils redisUtils;
 
     @Autowired
+    @Lazy
     private FeignAdamBaseClient feignAdamBaseClient;
 
     public ResponseDto userInfo(String code, String encryptedData, String iv, Integer type) {

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

@@ -26,6 +26,7 @@ import me.chanjar.weixin.mp.bean.template.WxMpTemplateData;
 import me.chanjar.weixin.mp.bean.template.WxMpTemplateMessage;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
@@ -63,6 +64,7 @@ public class SweetWechatTemplateServiceImpl {
     @Autowired
     private SweetRemindMapper sweetRemindMapper;
     @Autowired
+    @Lazy
     private FeignKylinPerformancesClient feignKylinPerformancesClient;
 
     @Autowired

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

@@ -11,6 +11,7 @@ import com.liquidnet.service.sweet.vo.SweetAppletUsersVo;
 import com.liquidnet.service.sweet.vo.SweetWechatUsersVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
@@ -28,6 +29,7 @@ import java.util.HashMap;
 public class SweetWechatUsersServiceImpl extends ServiceImpl<SweetWechatUsersMapper, SweetWechatUsers> implements ISweetWechatUsersService {
 
     @Autowired
+    @Lazy
     private FeignStoneIntegralClient feignStoneIntegralClient;
 
     @Autowired

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

@@ -8,14 +8,24 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.sweet.dto.param.SweetYbEnrollParam;
+import com.liquidnet.service.sweet.dto.vo.SweetYbActivityVo;
 import com.liquidnet.service.sweet.entity.SweetYbEnroll;
 import com.liquidnet.service.sweet.mapper.SweetYbEnrollMapper;
 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;
 
+import java.time.LocalDateTime;
+import java.util.Comparator;
 import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
 
 /**
  * <p>
@@ -26,13 +36,21 @@ import java.util.LinkedList;
  * @since 2022-07-29
  */
 @Service
-public class SweetYbEnrollServiceImpl extends ServiceImpl<SweetYbEnrollMapper, SweetYbEnroll> implements ISweetYbEnrollService {
+public class SweetYbEnrollServiceImpl implements ISweetYbEnrollService {
 
     @Autowired
     QueueUtils queueUtils;
+    @Autowired
+    RedisDataUtils redisDataUtils;
 
     @Override
     public ResponseDto<Boolean> create(SweetYbEnrollParam param) {
+        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"));
@@ -40,11 +58,34 @@ public class SweetYbEnrollServiceImpl extends ServiceImpl<SweetYbEnrollMapper, S
                 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()
+                StringUtil.isEmpty(param.getCityName()) ? "" : param.getCityName(), param.getActivityId(),param.getAge()
         });
         queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_ANSWER_INSERT.getKey(),
                 SqlMapping.gets(sqls, sqlsDataA));
 
         return ResponseDto.success(true);
     }
+
+    @Override
+    public ResponseDto<List<SweetYbActivityVo>> list() {
+        List<String> list = redisDataUtils.getSweetYbActivityList();
+        List<SweetYbActivityVo> voList = ObjectUtil.sweetYbActivityVoList();
+        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)) {
+                vo.setStatus(9);
+            } else if (now.isBefore(st)) {
+                vo.setStatus(0);
+            } else {
+                vo.setStatus(6);
+            }
+            voList.add(vo);
+        }
+        voList = voList.stream().sorted(Comparator.comparing(SweetYbActivityVo::getStatus, Comparator.naturalOrder()).thenComparing(SweetYbActivityVo::getStartTime,Comparator.reverseOrder())).collect(Collectors.toList());
+        return ResponseDto.success(voList);
+    }
+
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/ObjectUtil.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.sweet.utils;
 import com.liquidnet.service.sweet.dto.*;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityDrawVo;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityVo;
+import com.liquidnet.service.sweet.dto.vo.SweetYbActivityVo;
 import com.liquidnet.service.sweet.entity.SweetManualShop;
 import com.liquidnet.service.sweet.entity.SweetManualShopFive;
 import com.liquidnet.service.sweet.entity.SweetManualShopMdsk;
@@ -31,6 +32,12 @@ public class ObjectUtil {
     private static final ArrayList<SweetCItyVoteStatVo> sweetCItyVoteStatVoList = new ArrayList<>();
     private static final ArrayList<IntegralActivityVo> sweetIntegralActivityVoList = new ArrayList<>();
     private static final ArrayList<IntegralActivityDrawVo> sweetIntegralActivityDrawVoList = new ArrayList<>();
+    private static final ArrayList<SweetYbActivityVo> sweetYbActivityVo = new ArrayList<>();
+
+
+    public static ArrayList<SweetYbActivityVo> sweetYbActivityVoList() {
+        return (ArrayList<SweetYbActivityVo>) sweetYbActivityVo.clone();
+    }
 
     public static ArrayList<SweetManualAppletDto> getSweetManualAppletDtoList() {
         return (ArrayList<SweetManualAppletDto>) sweetManualAppletDtoList.clone();

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -15,6 +15,7 @@ import com.liquidnet.service.sweet.dto.*;
 import com.liquidnet.service.sweet.dto.param.poster.SweetStrawberryParam;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityDrawVo;
 import com.liquidnet.service.sweet.dto.vo.IntegralActivityVo;
+import com.liquidnet.service.sweet.dto.vo.SweetYbActivityVo;
 import com.liquidnet.service.sweet.dto.vo.TempBannerVo;
 import com.liquidnet.service.sweet.entity.*;
 import com.liquidnet.service.sweet.mapper.*;
@@ -22,6 +23,7 @@ import com.liquidnet.service.sweet.param.SweetCityVoteParam;
 import com.liquidnet.service.sweet.vo.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
@@ -52,6 +54,7 @@ public class RedisDataUtils {
     @Autowired
     private SweetArtistsMapper sweetArtistsMapper;
     @Autowired
+    @Lazy
     private FeignSlimeApiClient feignSlimeApiClient;
 
     public List<SweetManualAppletDto> setPushList() {
@@ -887,4 +890,27 @@ public class RedisDataUtils {
         }
     }
 
+    //yb活动vo
+    public List<String> getSweetYbActivityList() {
+        String redisKey = SweetConstant.REDIS_KEY_YB_ACTIVITY_LIST;
+        Object obj = redisUtil.get(redisKey);
+        if (obj == null) {
+            return CollectionUtil.arrayListString();
+        } else {
+            return (List<String>) obj;
+        }
+    }
+
+
+    //yb活动vo
+    public SweetYbActivityVo getSweetYbActivityVo(String activityId) {
+        String redisKey = SweetConstant.REDIS_KEY_YB_ACTIVITY.concat(activityId);
+        Object obj = redisUtil.get(redisKey);
+        if (obj == null) {
+            return SweetYbActivityVo.getNew();
+        } else {
+            return (SweetYbActivityVo) obj;
+        }
+    }
+
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisFiveDataUtils.java

@@ -20,6 +20,7 @@ import com.liquidnet.service.sweet.entity.SweetRichtextFive;
 import com.liquidnet.service.sweet.mapper.*;
 import com.liquidnet.service.sweet.vo.SweetArtistsRelationVo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
@@ -48,6 +49,7 @@ public class RedisFiveDataUtils {
     @Autowired
     private SweetArtistsMapper sweetArtistsMapper;
     @Autowired
+    @Lazy
     private FeignSlimeApiClient feignSlimeApiClient;
 
     public List<SweetManualAppletFiveDto> setPushList() {

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisMDSKDataUtils.java

@@ -14,6 +14,7 @@ import com.liquidnet.service.sweet.entity.*;
 import com.liquidnet.service.sweet.mapper.*;
 import com.liquidnet.service.sweet.vo.SweetArtistsRelationVo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
@@ -42,6 +43,7 @@ public class RedisMDSKDataUtils {
     @Autowired
     private SweetArtistsMapper sweetArtistsMapper;
     @Autowired
+    @Lazy
     private FeignSlimeApiClient feignSlimeApiClient;
 
     public List<SweetManualAppletMDSKDto> setPushList() {

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisTFCDataUtils.java

@@ -17,6 +17,7 @@ import com.liquidnet.service.sweet.entity.SweetRichtextTfc;
 import com.liquidnet.service.sweet.mapper.*;
 import com.liquidnet.service.sweet.vo.SweetArtistsRelationVo;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
@@ -43,6 +44,7 @@ public class RedisTFCDataUtils {
     @Autowired
     private SweetManualShopTfcMapper sweetManualShopTFCMapper;
     @Autowired
+    @Lazy
     private FeignSlimeApiClient feignSlimeApiClient;
 
     public List<SweetManualAppletTFCDto> setPushList() {