Merge branch 'master' into consumer_unite

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/constant/GoblinRedisConst.java

@@ -134,6 +134,7 @@ public class GoblinRedisConst {
     public static final String REDIS_GOBLIN_NFT_GOODS_LIST_INFO = PREFIX.concat("nft:goodsList:info:");// nft商品列表单藏品详情 skuId
     public static final String REDIS_GOBLIN_NFT_NUM_ACCOUNT = PREFIX.concat("nft:account:");// nft用户数字账户是否开通 userId
     public static final String REDIS_GOBLIN_NFT_NUM_ACCOUNT_INFO = PREFIX.concat("nft:account:info:");// nft用户数字账户开通信息 userId
+    public static final String REDIS_GOBLIN_NFT_NOT_PAY_NUM = PREFIX.concat("nft:notPay:");// nft藏品待支付订单数量 skuId:listId
     /**
      * {goblin:nft:certmeta:{idType+idNo},{idname,mobile}}
      */

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

@@ -91,11 +91,17 @@ public class GoblinNftExActivityVo implements Serializable, Cloneable {
 
 
     /**
-     *
+     * 是否展示生效中
      */
     @ApiModelProperty(position = 18, required = true, value = "是否展示生效中 0：否  1：是")
     private Integer isDisplay;
 
+    /**
+     * 是否展示延期按钮
+     */
+    @ApiModelProperty(position = 19, required = true, value = "是否展示延期按钮 0不展示 1展示")
+    private Integer isDelay;
+
 
     private final static GoblinNftExActivityVo obj = new GoblinNftExActivityVo();
 

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

@@ -94,19 +94,23 @@ public class GoblinNftGoodsSkuInfoVo implements Serializable, Cloneable {
     @ApiModelProperty(position = 65, value = "是否开启兑换 1未开启 2已开启")
     private int isExchange;
 
-    @ApiModelProperty(position = 65, value = "单品AR文件URL-iOS版")
+    @ApiModelProperty(position = 66, value = "待支付订单数量")
+    private int notPayNum;
+
+    @ApiModelProperty(position = 67, value = "单品AR文件URL-iOS版")
     private String arUrlIos;
-    @ApiModelProperty(position = 66, value = "单品AR文件URL-Android版")
+    @ApiModelProperty(position = 68, value = "单品AR文件URL-Android版")
     private String arUrlAndroid;
-    @ApiModelProperty(position = 67, value = "标签[0-提前购买|1-分段购买]")
+
+    @ApiModelProperty(position = 69, value = "标签[0-提前购买|1-分段购买]")
     private Integer tagType;
-    @ApiModelProperty(position = 68, value = "分批购活动id")
+    @ApiModelProperty(position = 70, value = "分批购活动id")
     private String listId;
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
-    @ApiModelProperty(position = 69, value = "sku正常开售时间")
+    @ApiModelProperty(position = 71, value = "sku正常开售时间")
     private LocalDateTime baseSaleStartTime;
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
-    @ApiModelProperty(position = 70, value = "下个分段购开始时间，如果为null则没有")
+    @ApiModelProperty(position = 72, value = "下个分段购开始时间，如果为null则没有")
     private LocalDateTime nextSaleStartTime;
 
     private static final GoblinNftGoodsSkuInfoVo obj = new GoblinNftGoodsSkuInfoVo();

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinNftExActivityDelayParam.java

+package com.liquidnet.service.goblin.param;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+@ApiModel(value = "GoblinNftExActivityDelayParam", description = "该活动下兑换码延期入参")
+@Data
+public class GoblinNftExActivityDelayParam implements Serializable {
+
+    private static final long serialVersionUID = 5608646910502058970L;
+
+    @ApiModelProperty(position = 10, required = true, value = "老的活动id")
+    @NotBlank(message = "老的活动i不能为空")
+    private String activityId;
+
+    @ApiModelProperty(position = 11, required = true, value = "活动标题", example = "")
+    @NotBlank(message = "活动标题不能为空")
+    private String title;
+
+    @ApiModelProperty(position = 12, required = true, value = "用户id", example = "")
+    @NotBlank(message = "用户id不能为空")
+    private String uid;
+
+    @ApiModelProperty(position = 12, required = true, value = "开始时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @NotNull(message = "开始时间不能为空")
+    private LocalDateTime startTime;
+
+    @ApiModelProperty(position = 13, required = true, value = "结束时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
+    @NotNull(message = "结束时间不能为空")
+    private LocalDateTime endTime;
+
+}
+
+

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/param/GoblinNftExActivityParam.java

@@ -7,32 +7,31 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 
-@ApiModel(value ="GoblinNftExActivityParam",description = "添加方法入参")
+@ApiModel(value = "GoblinNftExActivityParam", description = "添加方法入参")
 @Data
 public class GoblinNftExActivityParam implements Serializable {
 
-    @ApiModelProperty(position = 10,required = false,value = "nft活动id")
+    @ApiModelProperty(position = 10, required = false, value = "nft活动id")
     private String activityId;
 
-    @ApiModelProperty(position = 11,required = true,value = "活动标题" ,example = "草莓音乐节")
+    @ApiModelProperty(position = 11, required = true, value = "活动标题", example = "")
     private String title;
 
-    @ApiModelProperty(position = 12,required = true,value = "用户id",example = "用户id")
+    @ApiModelProperty(position = 12, required = true, value = "用户id", example = "")
     private String uid;
 
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
-    @ApiModelProperty(position = 12,required = false,value = "开始时间")
+    @ApiModelProperty(position = 12, required = false, value = "开始时间")
     private LocalDateTime startTime;
 
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = DateUtil.DATE_FULL_STR)
-    @ApiModelProperty(position = 13,required = false,value = "结束时间")
+    @ApiModelProperty(position = 13, required = false, value = "结束时间")
     private LocalDateTime endTime;
 
-    @ApiModelProperty(position = 14,required = true,value = "当前页(查询时传入)")
+    @ApiModelProperty(position = 14, required = true, value = "当前页(查询时传入)", example = "1")
     private Integer pageNum;
 
 }

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/service/IGoblinNftExActivityService.java

@@ -5,6 +5,7 @@ import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.vo.GoblinNftExActivityVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinNftSkuVo;
 import com.liquidnet.service.goblin.dto.vo.PageInfoVo;
+import com.liquidnet.service.goblin.param.GoblinNftExActivityDelayParam;
 import com.liquidnet.service.goblin.param.GoblinNftExActivityParam;
 
 import javax.servlet.http.HttpServletResponse;
@@ -43,4 +44,6 @@ public interface IGoblinNftExActivityService {
      * @param goblinNftExActivityParam
      */
     void excel(HttpServletResponse httpServletResponse, GoblinNftExActivityParam goblinNftExActivityParam);
+
+    ResponseDto delay(GoblinNftExActivityDelayParam goblinNftExActivityDelayParam);
 }

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/constant/SmileRedisConst.java

@@ -21,6 +21,8 @@ public class SmileRedisConst {
     public static final String SELL_DATA_COMMISSION = PREFIX.concat("sellDataCommission:");  //销售数据 第一步
     public static final String SELL_SHOW_PAYMENT = PREFIX.concat("show:payment:");  //打款信息  SELL_SHOW_PAYMENT+演出id+uid
 
+    public static final String SELL_SHOW_PAYMENT_ENDJOB = PREFIX.concat("show:payment:endJob");  //定时任务结算信息  SELL_SHOW_PAYMENT_ENDJOB+演出id+uid
+
     public static final String SELL_USER_REVENUE = PREFIX.concat("user:revenue:");  //用户总营收  SELL_USER_REVENUE+uid
 
     public static final String SELL_TEST = PREFIX.concat("test");  //用户总营收  SELL_USER_REVENUE+uid

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

 package com.liquidnet.service.goblin.dto.vo;
 
+import com.liquidnet.service.smile.entity.SmileSchool;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,6 +21,8 @@ public class SmileSchoolVo implements Serializable {
 
     private Long id;
 
+    private String schoolId;
+
     /**
      * 学校名称
      */
@@ -69,4 +72,21 @@ public class SmileSchoolVo implements Serializable {
     private String area;
 
 
+    public SmileSchoolVo copy(SmileSchool smileSchool) {
+        //KylinApiCameraDevicesVo kylinApiCameraDevicesVo = KylinApiCameraDevicesVo.getNew();
+        //        if (null == source) return null;
+        SmileSchoolVo smileSchoolVo = new SmileSchoolVo();
+        if (null==smileSchool) return null;
+        smileSchoolVo.setId(smileSchool.getId());
+        smileSchoolVo.setSchoolId(smileSchool.getId().toString());
+        smileSchoolVo.setName(smileSchool.getName());
+        smileSchoolVo.setAddress(smileSchool.getAddress());
+        smileSchoolVo.setProvinceKey(smileSchool.getProvinceId());
+        smileSchoolVo.setProvince(smileSchool.getProvince());
+        smileSchoolVo.setCityKey(smileSchool.getCityId());
+        smileSchoolVo.setCity(smileSchool.getCity());
+        smileSchoolVo.setAreaKey(smileSchool.getAreaId());
+        smileSchoolVo.setArea(smileSchool.getArea());
+        return smileSchoolVo;
+    }
 }

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/service/manage/SmileFrontService.java

 package com.liquidnet.service.goblin.service.manage;
 
+import com.liquidnet.service.goblin.dto.vo.SmileSchoolVo;
 import com.liquidnet.service.goblin.dto.vo.SmileSellDataDetailVO;
 import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
@@ -11,6 +12,7 @@ public interface SmileFrontService {
     public boolean saveOrUpdateUser(SmileUserVO smileUserVO,SmileUserVO redisVo,String type);
     public List<KylinPerformanceVo>  getPerformance();
     public void deleteUser(String uid);
-    public boolean auth(String uid,SmileUserVO redisVo);
+    public boolean auth(String uid,SmileUserVO redisVo,boolean b);
     public SmileSellDataDetailVO getSellDataDetail(String agentId, String ticketId, String activeName, String ticketName);
+    public List<SmileSchoolVo> getSchool(String name);
 }

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

@@ -27,6 +27,8 @@ public class SmileAgentController {
     @Autowired
     ISmileAgentService smileAgentService;
 
+    private Boolean tag = true;
+
     @PostMapping("/list")
     @ApiOperation("根据PerId获取票提")
     @ResponseBody
@@ -41,5 +43,17 @@ public class SmileAgentController {
         return smileAgentService.create(smileAgents);
     }
 
+    @PostMapping("/delPerId")
+    @ApiOperation("删除（旧版）演出id集合")
+    @ResponseBody
+    public AjaxResult delPerId(){
+        if (tag){
+            smileAgentService.delPerId();
+            tag = false;
+            return AjaxResult.success();
+        }
+        return AjaxResult.warn("已删除");
+    }
+
 
 }

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

@@ -58,4 +58,10 @@ public class SmileShowController {
         return smileShowService.allPrice(smilePriceParam);
     }
 
+    @GetMapping("/updateRedis")
+    @ApiOperation("修改原保存演出id的数据类型,分支dev_0507kids  部署完执行接口（演出列表重复问题修复也可以运行此接口）")
+    public AjaxResult updateRedis(){
+        return smileShowService.updateRedis();
+    }
+
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userList/detail.html

@@ -134,11 +134,11 @@
                     <span id="identity2">已毕业</span>
                 </div>
                 <div class="items">
-                    <p>学校全称/单位名称:</p>
+                    <p>在读学校全称/毕业院校名称:</p>
                     <input type="text" disabled id="schoolName" autocomplete="off" value="北京 北京市 朝阳区" class="layui-input">
                 </div>
                 <div class="items">
-                    <p>所学专业/所在部门:</p>
+                    <p>所学专业:</p>
                     <input type="text" disabled id="schoolMajor" autocomplete="off" value="北京 北京市 朝阳区" class="layui-input">
                 </div>
                 <!-- <div class="items">

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userPendingList/detail.html

@@ -9,7 +9,7 @@
 <div class="detail_status">用户状态：<span></span></div>
 <p class="detail_title">基础资料</p>
 <p>照片</p>
-<div class="detail_inner detail_img"><img src=""></div>
+<div class="detail_inner detail_img"><img style="height: 120px;" src=""></div>
 <p>真实姓名</p>
 <div class="detail_inner detail_name"></div>
 <p>出生日期</p>
@@ -20,9 +20,9 @@
 <div class="detail_inner detail_city"></div>
 <p>你的身份</p>
 <div class="detail_inner detail_id"></div>
-<p>学校全称/单位名称</p>
+<p>在读学校全称/毕业院校名称</p>
 <div class="detail_inner detail_school"></div>
-<p>所学专业/所在部门</p>
+<p>所学专业</p>
 <div class="detail_inner detail_acc"></div>
 <!--<p>微信号</p>-->
 <!--<div class="detail_inner detail_wx"></div>-->
@@ -33,6 +33,10 @@
 <div class="detail_inner detail_idcode"></div>
 <p class="detail_title">自我介绍</p>
 <div class="detail_inner detail_desc"></div>
+<p class="detail_title">个人技能(选填)</p>
+<div class="detail_inner detail_desc1"></div>
+<div class="detail_inner detail_desc2"></div>
+<div class="detail_inner detail_desc3"></div>
 <p>手机号：</p>
 <div class="detail_inner detail_mobail"></div>
 <!--<p>提交时间：</p>-->
@@ -124,6 +128,9 @@
             $('.detail_name').text(detailData.name);
             $('.detail_idcode').text(detailData.idCard);
             $('.detail_desc').text(detailData.introduce);
+            $('.detail_desc1').text(detailData.specialty1);
+            $('.detail_desc2').text(detailData.specialty2);
+            $('.detail_desc3').text(detailData.specialty3);
             $('.detail_mobail').text(detailData.phone);
             $('.detail_created').text(detailData.createdDate);
             if (detailData.type != 0) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/edit.html

@@ -29,7 +29,7 @@
             <label class="col-sm-3 control-label is-required">头像：</label>
             <div class="col-sm-8">
                 <!--                <input name="img" class="form-control" type="text" th:value="*{img}" readonly required>-->
-                <img class="img-details" name="img" th:src="*{img}"
+                <img class="img-details" style="height: 800px;" name="img" th:src="*{img}"
                      th:onclick="click_big([[*{img}]])">
             </div>
         </div>
@@ -60,12 +60,12 @@
                        required>
             </div>
         </div>
-        <div class="form-group">
-            <label class="col-sm-3 control-label is-required">专长：</label>
-            <div class="col-sm-8">
-                <input name="specialty" class="form-control" type="text" th:value="*{specialty}" readonly required>
-            </div>
-        </div>
+<!--        <div class="form-group">-->
+<!--            <label class="col-sm-3 control-label is-required">专长：</label>-->
+<!--            <div class="col-sm-8">-->
+<!--                <input name="specialty" class="form-control" type="text" th:value="*{specialty}" readonly required>-->
+<!--            </div>-->
+<!--        </div>-->
         <div class="form-group">
             <label class="col-sm-3 control-label is-required">特长：</label>
             <div class="col-sm-8">
@@ -150,6 +150,27 @@
         focusCleanup: true
     });
 
+    // 点击图片放大
+    function click_big(url) {
+        var img_url = url
+        if (url.indexOf("x-oss-process") != "-1") {
+            img_url = url.split("?")[0]
+        }
+        var json = {
+            "data": [   //相册包含的图片，数组格式
+                {
+                    "alt": "图片",
+                    "src": img_url, //原图地址
+                }
+            ]
+        };
+        layer.photos({
+            photos: json,
+            closeBtn: 1, //右上角按钮，可通过配置1和2来展示，如果不显示，则closeBtn: 0
+            anim: 5 //0-6的选择，指定弹出图片动画类型，默认随机（请注意，3.0之前的版本用shift参数）
+        });
+    }
+
     function submitHandler(status) {
         var teamIds = $("input[name^='teamCheck']:checked").val()
         var uid = $("input[name^='uid']").val()

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/list.html

@@ -23,13 +23,25 @@
                             <input type="text" name="name"/>
                         </li>
                         <li>
-                            <label>职责组：</label>
+                            <label>申请组：</label>
                             <input type="text" name="team"/>
                         </li>
+                        <li>
+                            <label>分配组：</label>
+                            <input type="text" name="teamAudit"/>
+                        </li>
                         <li>
                             <label>手机号：</label>
                             <input type="text" name="phone"/>
                         </li>
+                        <li>
+                            <label>性别：</label>
+                            <select name="sex">
+                                <option value="-1">全部</option>
+                                <option value="1">男</option>
+                                <option value="2">女</option>
+                            </select>
+                        </li>
                         <li>
                             <label>审核状态：</label>
                             <select name="status">
@@ -113,15 +125,19 @@
                 },
                 {
                     field: 'team1',
-                    title: '申请职责1'
+                    title: '申请组1'
                 },
                 {
                     field: 'team2',
-                    title: '申请职责2'
+                    title: '申请组2'
                 },
                 {
                     field: 'team3',
-                    title: '申请职责3'
+                    title: '申请组3'
+                },
+                {
+                    field: 'teamAudit',
+                    title: '分配组'
                 },
                 {
                     field: 'status',

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/volunteers/project/list.html

@@ -53,29 +53,61 @@
             columns: [{
                 checkbox: true
             },
-                {
-                    field: 'projectId',
-                    title: '活动id'
-                },
+                // {
+                //     field: 'projectId',
+                //     title: '活动id'
+                // },
                 {
                     field: 'title',
                     title: '活动名称'
                 },
+
                 {
-                    field: 'img',
-                    title: '封面图',
-                    formatter: function (value, row, index) {
-                        return $.table.imageView(value, "300", "300");
-                    }
+                    field: 'all',
+                    title: '报名人数'
+                },
+                {
+                    field: 'unAudit',
+                    title: '待审核'
+                },
+                {
+                    field: 'audit',
+                    title: '审核通过'
                 },
+                {
+                    field: 'refuse',
+                    title: '已拒绝'
+                },
+
+                // {
+                //     field: 'img',
+                //     title: '封面图',
+                //     formatter: function (value, row, index) {
+                //         return $.table.imageView(value, "300", "300");
+                //     }
+                // },
                 {
                     field: 'timeStart',
-                    title: '开始时间'
+                    title: '活动时间',
+                    formatter: function (value, row, index) {
+                        return row.timeStart.split("T")[0] +" 至 "+row.timeEnd.split("T")[0]
+                    }
                 },
                 {
-                    field: 'timeEnd',
-                    title: '结束时间'
+                    field: 'timeStatus',
+                    title: '活动状态',
+                    formatter: function (value, row, index) {
+                        if(value===1){
+                            return "活动中"
+                        }else{
+                            return "已结束";
+                        }
+                    }
                 },
+                // {
+                //     field: 'timeEnd',
+                //     title: '结束时间'
+                // },
 
                 {
                     field: 'createdAt',

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/test/java/com.liquidnet.client.admin/TestLocal.java

 package com.liquidnet.client.admin;
 
-import com.liquidnet.client.admin.common.utils.security.Md5Utils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.commons.lang.constant.LnsEnum;
 import com.liquidnet.commons.lang.util.CurrentUtil;
 import com.liquidnet.commons.lang.util.MD5;
+import com.liquidnet.service.goblin.dto.vo.SmileSchoolVo;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
 import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
+import com.liquidnet.service.smile.entity.SmileSchool;
+import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.result.UpdateResult;
 import org.junit.Test;
@@ -23,6 +27,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import java.time.LocalDateTime;
 import java.util.Arrays;
+import java.util.List;
 
 /**
  * Test
@@ -69,4 +74,18 @@ public class TestLocal {
         boolean contains = Arrays.asList(LnsEnum.ENV.dev.name(), LnsEnum.ENV.test.name()).contains(environment.getProperty(CurrentUtil.CK_ENV_ACTIVE));
         System.out.println(contains);
     }
+
+    @Autowired
+    private SmileSchoolMapper smileSchoolMapper;
+
+    @Test
+    public void testSaveSmileSchoolMongodb(){
+        LambdaQueryWrapper<SmileSchool> queryWrapper = Wrappers.lambdaQuery(SmileSchool.class);
+        queryWrapper.eq(SmileSchool::getDelTag,0);
+        List<SmileSchool> smileSchools = smileSchoolMapper.selectList(queryWrapper);
+        smileSchools.forEach(smileSchool->{
+            SmileSchoolVo smileSchoolVo = new SmileSchoolVo().copy(smileSchool);
+            mongoTemplate.insert(smileSchoolVo, SmileSchoolVo.class.getSimpleName());
+        });
+    };
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

@@ -15,6 +15,7 @@ import com.liquidnet.client.admin.zhengzai.slime.service.ISlimeAuthorizationReco
 import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.service.goblin.dto.vo.SmileAgentVo;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
 import com.liquidnet.service.kylin.dao.*;
 import com.liquidnet.service.kylin.dto.param.*;
@@ -598,7 +599,6 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
             ticketStatus.setIsAgent(status);
             ticketStatusMapper.update(ticketStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketId));
             performanceVoUtils.performanceVoStatus(performancesId);
-            List<KylinPerformances> kylinPerformances = kylinPerformancesMapper.selectPerIdByAgent();
             //存入票提默认 总代 普代都为0  默认0.000
             SmileAgent smileAgent = new SmileAgent();
             smileAgent.setPerformanceId(performancesId);
@@ -617,13 +617,8 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                 smileAgentMapper.update(smileAgent,queryWrapper);
                 //删除票提redis
                 smileRedisUtils.delAgent(performancesId,ticketId);
-            }
-
-
-            List<String> collect = kylinPerformances.stream().map(KylinPerformances::getPerformancesId).collect(Collectors.toList());
-            String perId = StringUtils.join(collect,",");
-            if (!"".equals(perId)){
-                smileRedisUtils.setShowIds(perId);
+                //查询是否还有设置过开启的票种
+                agentCarryGtZeroByPerId(performancesId);
             }
             return true;
         } catch (Exception e) {
@@ -631,6 +626,34 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
         }
     }
 
+    //校验该演出是否有其他票提设置  用于删除redis中演出id List
+    private void agentCarryGtZeroByPerId(String performancesId) {
+        List<SmileAgent> agents = smileAgentMapper.selectAgentCarryGtZeroByPerId(performancesId);
+        if (agents.size()>0){
+            //是否设置过票提
+            boolean tag = true;
+            for (SmileAgent agent : agents) {
+                SmileAgentVo agent1 = smileRedisUtils.getAgent(agent.getPerformanceId(), agent.getTicketId());
+                if (agent1!=null){
+                    tag = false;
+                    break;
+                }
+            }
+            if (tag) {
+                //redis中删除演出id
+                log.debug("查询没有设置过perId:{},删除演出列表id", performancesId);
+                List<String> showIds = smileRedisUtils.getShowIds();
+                showIds.remove(performancesId);
+                smileRedisUtils.setShowIds(showIds);
+            }
+        }else {
+            //删除演出ids
+            List<String> showIds = smileRedisUtils.getShowIds();
+            showIds.remove(performancesId);
+            smileRedisUtils.setShowIds(showIds);
+        }
+    }
+
     @Override
     public boolean changeTicketPayTxt(String performancesId, String ticketId, String payTxt) {
         dataUtils.setTicketPayTxt(ticketId, payTxt);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/ShowTicketVo.java

@@ -21,7 +21,7 @@ public class ShowTicketVo {
     /**
      * 类型 票类型 1.单日票 2.通票
      */
-    private int type;
+    private String type;
 
     /**
      * 适用开始时间
@@ -48,4 +48,5 @@ public class ShowTicketVo {
      */
     private BigDecimal totalPrice;
 
+
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileVSParam.java

@@ -19,8 +19,12 @@ public class SmileVSParam {
     private String phone;
     @ApiModelProperty(value = "审核状态", example = "")
     private Integer status;
-    @ApiModelProperty(value = "职责组名称", example = "")
+    @ApiModelProperty(value = "性别[1-男|2-女]", example = "")
+    private Integer sex;
+    @ApiModelProperty(value = "申请职责组名称", example = "")
     private String team;
+    @ApiModelProperty(value = "分配职责组名称", example = "")
+    private String teamAudit;
     @ApiModelProperty(value = "活动id", example = "")
     private String projectId;
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileAgentService.java

@@ -30,4 +30,6 @@ public interface ISmileAgentService extends IService<SmileAgent> {
      * @return ：AjaxResult
      */
     AjaxResult getAgent(String performancesId);
+
+    void delPerId();
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileShowService.java

@@ -61,4 +61,11 @@ public interface ISmileShowService extends IService<SmileSchool> {
      * @return ： AjaxResult
      */
     AjaxResult allPrice(SmilePriceParam smilePriceParam);
+
+    /**
+     * 修改原保存演出id的数据类型
+     * @return
+     */
+    AjaxResult updateRedis();
+
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/ISmileVolunteersProjectService.java

@@ -7,6 +7,7 @@ import com.liquidnet.client.admin.zhengzai.smile.dto.SmileVPSParam;
 import com.liquidnet.service.goblin.dto.vo.SmileProjectDetailsVo;
 import com.liquidnet.service.smile.entity.SmileVolunteersProject;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.liquidnet.service.smile.entity.dto.SmileVolunteersProjectListDto;
 
 import java.util.List;
 
@@ -21,7 +22,7 @@ import java.util.List;
 public interface ISmileVolunteersProjectService extends IService<SmileVolunteersProject> {
 
     //活动列表
-    List<SmileVolunteersProject> list(SmileVPSParam param);
+    List<SmileVolunteersProjectListDto> list(SmileVPSParam param);
 
     //活动添加
     AjaxResult insertData(SmileVPParam param);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileAgentServiceImpl.java

@@ -11,10 +11,12 @@ import com.liquidnet.service.smile.entity.SmileAgent;
 import com.liquidnet.service.smile.entity.dao.SmileAgentDao;
 import com.liquidnet.service.smile.mapper.SmileAgentMapper;
 import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.annotation.Before;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PostConstruct;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.List;
@@ -46,25 +48,32 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
             }
             if (result) {
                 try {
-                    for (SmileAgent smileAgent : smileAgents){
-                        SmileAgentVo agent = smileRedisUtils.getAgent(smileAgent.getPerformanceId(),smileAgent.getTicketId());
-                        if (agent!=null){
-                            log.info("SmileAgent:{}",agent);
+                    for (SmileAgent smileAgent : smileAgents) {
+                        SmileAgentVo agent = smileRedisUtils.getAgent(smileAgent.getPerformanceId(), smileAgent.getTicketId());
+                        if (agent != null) {
+                            log.info("SmileAgent:{}", agent);
                             //修改过票提则无法再次修改
                             return AjaxResult.warn("票提一但设置，无法修改！");
                         }
                     }
                     smileAgents.forEach(smileAgent -> {
                         //是否是修改票提
-                        smileAgentMapper.updateAgentById(smileAgent.getId(),smileAgent.getTotalCarry().divide(BigDecimal.valueOf(100),2, RoundingMode.DOWN),smileAgent.getOrdCarry().divide(BigDecimal.valueOf(100),2,RoundingMode.DOWN));
+                        smileAgent.setTotalCarry(smileAgent.getTotalCarry().divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN));
+                        smileAgent.setOrdCarry(smileAgent.getOrdCarry().divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN));
+                        smileAgentMapper.updateAgentById(smileAgent.getId(), smileAgent.getTotalCarry(), smileAgent.getOrdCarry());
                         SmileAgentVo smileAgentVo = new SmileAgentVo();
                         BeanUtils.copyProperties(smileAgent, smileAgentVo);
-                        smileRedisUtils.setAgent(smileAgent.getPerformanceId(),smileAgent.getTicketId(), smileAgentVo);
+                        smileRedisUtils.setAgent(smileAgent.getPerformanceId(), smileAgent.getTicketId(), smileAgentVo);
                         log.debug("create create Agent id：{},PerformanceId:{},TicketId:{}",
                                 smileAgent.getId(),
                                 smileAgent.getPerformanceId(),
                                 smileAgent.getTicketId());
                     });
+
+                    //设置票提的时候将该演出放到前端显示的演出列表中
+                    List<String> showIds = smileRedisUtils.getShowIds();
+                    showIds.add(smileAgents.get(0).getPerformanceId());
+                    smileRedisUtils.setShowIds(showIds);
                     return AjaxResult.success();
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -83,4 +92,9 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
         }
         return AjaxResult.warn("演出未开启代理");
     }
+
+    @Override
+    public void delPerId() {
+        smileRedisUtils.delShow();
+    }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileSchoolServiceImpl.java

@@ -16,10 +16,14 @@ import com.liquidnet.service.smile.entity.SmileUser;
 import com.liquidnet.service.smile.mapper.SmileSchoolMapper;
 import com.liquidnet.service.smile.mapper.SmileUserMapper;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.PostConstruct;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -45,11 +49,14 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
     @Autowired
     SmileRedisUtils smileRedisUtils;
 
+    @Autowired
+    MongoTemplate mongoTemplate;
+
     @Override
     public PageInfo<SmileSchool> schoolList(SmileSchoolParam smileSchoolParam) {
         PageInfo<SmileSchool> pageInfo;
         try {
-            Map<String,Object> map = BeanUtil.convertBeanToMap(smileSchoolParam);
+            Map<String, Object> map = BeanUtil.convertBeanToMap(smileSchoolParam);
             List<SmileSchool> smileSchools = smileSchoolMapper.selectSchoolList(map);
             pageInfo = new PageInfo<>(smileSchools);
         } catch (Exception e) {
@@ -69,27 +76,35 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
         log.debug("smileSchool:{}", smileSchool);
         LambdaQueryWrapper<SmileSchool> queryWrapper = Wrappers.lambdaQuery(SmileSchool.class);
         queryWrapper.eq(SmileSchool::getName, smileSchool.getName());
-        queryWrapper.eq(SmileSchool::getDelTag,0);
+        queryWrapper.eq(SmileSchool::getDelTag, 0);
         if (smileSchoolMapper.selectOne(queryWrapper) == null) {
             smileSchoolMapper.insert(smileSchool);
             //保存学校
-            smileRedisUtils.setSchool(String.valueOf(smileSchool.getId()),smileSchool.getName());
-            updateSchoolRedis();
+            smileRedisUtils.setSchool(String.valueOf(smileSchool.getId()), smileSchool.getName());
+            SmileSchoolVo smileSchoolVo = new SmileSchoolVo().copy(smileSchool);
+            mongoTemplate.insert(smileSchoolVo, SmileSchoolVo.class.getSimpleName());
+            //判断是否需要新增redis
+            List<SmileSchoolVo> schoolAll = smileRedisUtils.getSchoolAll();
+            if (schoolAll != null && schoolAll.size() < 20) {
+                updateSchoolRedis();
+            }
             return AjaxResult.success();
         }
         return AjaxResult.warn("学校已存在");
     }
 
-
     @Override
     public AjaxResult updateSchoolById(SmileSchool smileSchool) {
         LambdaQueryWrapper<SmileSchool> queryWrapper = Wrappers.lambdaQuery(SmileSchool.class);
         queryWrapper.eq(SmileSchool::getId, smileSchool.getId());
-        queryWrapper.eq(SmileSchool::getDelTag,0);
+        queryWrapper.eq(SmileSchool::getDelTag, 0);
         if (smileSchoolMapper.update(smileSchool, queryWrapper) > 0) {
             //更新User表  根据学校id修改用户学校名称
             smileUserMapper.updateUserSchoolBySchoolId(smileSchool.getId().toString(), smileSchool.getName());
-            smileRedisUtils.setSchool(String.valueOf(smileSchool.getId()),smileSchool.getName());
+            smileRedisUtils.setSchool(String.valueOf(smileSchool.getId()), smileSchool.getName());
+            //修改数据
+            SmileSchoolVo smileSchoolVo = new SmileSchoolVo().copy(smileSchool);
+            mongoTemplate.save(smileSchoolVo, SmileSchoolVo.class.getSimpleName());
             //更新redis
             updateSchoolRedis();
             return AjaxResult.success();
@@ -101,14 +116,17 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
     public AjaxResult del(Long id) {
         //查询是否有用户使用过该学校
         LambdaQueryWrapper<SmileUser> queryWrapper = Wrappers.lambdaQuery(SmileUser.class);
-        queryWrapper.eq(SmileUser::getSchoolId,id);
-        queryWrapper.eq(SmileUser::getDelTag,0);
+        queryWrapper.eq(SmileUser::getSchoolId, id);
+        queryWrapper.eq(SmileUser::getDelTag, 0);
         List<SmileUser> smileUsers = smileUserMapper.selectList(queryWrapper);
-        if (smileUsers.size() > 0){
+        if (smileUsers.size() > 0) {
             return AjaxResult.warn("该学校已被使用，不可删除");
         }
         //学校没有被使用  可以删除
         smileSchoolMapper.updateDel(id);
+        //mongodb删除
+        Query query = new Query(Criteria.where("id").is(id));
+        mongoTemplate.remove(query, SmileSchoolVo.class, SmileSchoolVo.class.getSimpleName());
         smileRedisUtils.delSchool(String.valueOf(id));
         updateSchoolRedis();
         return AjaxResult.success();
@@ -118,15 +136,40 @@ public class SmileSchoolServiceImpl extends ServiceImpl<SmileSchoolMapper, Smile
     private void updateSchoolRedis() {
         List<SmileSchoolVo> smileSchoolVos = new ArrayList<>();
         smileSchoolMapper.selectListLimit().forEach(smileSchool -> {
-            SmileSchoolVo smileSchoolVo = new SmileSchoolVo();
+            SmileSchoolVo smileSchoolVo = new SmileSchoolVo().copy(smileSchool);
+            smileSchoolVos.add(smileSchoolVo);
+        });
+        smileRedisUtils.setSchoolAll(smileSchoolVos);
+    }
+
+    public void saveSmileSchoolMongodb() {
+        LambdaQueryWrapper<SmileSchool> queryWrapper = Wrappers.lambdaQuery(SmileSchool.class);
+        queryWrapper.eq(SmileSchool::getDelTag, 0);
+        List<SmileSchool> smileSchools = smileSchoolMapper.selectList(queryWrapper);
+        smileSchools.forEach(smileSchool -> {
+            SmileSchoolVo smileSchoolVo = new SmileSchoolVo().copy(smileSchool);
             try {
-                BeanUtils.copyProperties(smileSchool,smileSchoolVo);
-                smileSchoolVos.add(smileSchoolVo);
-            }catch (Exception e) {
-                e.printStackTrace();
+                mongoTemplate.insert(smileSchoolVo, SmileSchoolVo.class.getSimpleName());
+            } catch (Exception e) {
+                log.debug("数据存在：{}", smileSchoolVo);
             }
         });
-        smileRedisUtils.setSchoolAll(smileSchoolVos);
+    }
+
+    /**
+     * 跟新redis中学校SmileSchoolVo类：dev_kids0609初始化
+     */
+    private void updateRedisSchoolAll() {
+        Query query = new Query();
+        long count = mongoTemplate.count(query, SmileSchoolVo.class.getSimpleName());
+        if (count == 0) {
+            //删除旧redisSchoolAll缓存
+            smileRedisUtils.delSchoolAll();
+            //跟新缓存
+            updateSchoolRedis();
+            //mongodb初始化就数据
+            saveSmileSchoolMongodb();
+        }
     }
 
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -11,6 +11,7 @@ import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.client.admin.zhengzai.smile.dto.*;
 import com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService;
 import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
+import com.liquidnet.service.goblin.constant.SmileRedisConst;
 import com.liquidnet.service.kylin.dao.TicketAndStatusDao;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.entity.KylinPerformanceStatus;
@@ -34,12 +35,8 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.text.DecimalFormat;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -135,17 +132,29 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
 
     @Override
     public AjaxResult sort(ShowSort showSort) {
+
         //查询数据库是否又该顺序的演出
         kylinPerformancesMapper.updateComment(showSort.getSort());
         kylinPerformancesMapper.updateCommentByPer(showSort.getSort(), showSort.getPerformancesId());
+        log.info("redis show key:{}", showSort.getPerformancesId());
+        //判断该演出是否修改过票提
+        if (smileRedisUtils.getShowIds().stream().anyMatch(showId -> showSort.getPerformancesId().equals(showId))){
+            List<String> showIds = smileRedisUtils.getShowIds();
+            showIds.remove(showSort.getPerformancesId());
+            showIds.add(0,showSort.getPerformancesId());
+            smileRedisUtils.setShowIds(showIds);
+
+            return AjaxResult.success();
+        }else {
+            return AjaxResult.warn("清先为演出设置票提！");
+        }
 
-        //获取排序演出id
+        /*//获取排序演出id
         List<String> collect = kylinPerformancesMapper.selectPerIdByAgent().stream().map(KylinPerformances::getPerformancesId).collect(Collectors.toList());
         String perId = StringUtils.join(collect, ",");
         //保存所有演出id带顺序
-        smileRedisUtils.setShowIds(perId);
-        log.info("redis show key:{}", perId);
-        return AjaxResult.success();
+        smileRedisUtils.setShowIds(perId);*/
+
     }
 
     @Override
@@ -224,7 +233,7 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                         showTicketVo.setTitle(ticketAndStatusDao.getTitle());
                         //单价
                         showTicketVo.setPrice(ticketAndStatusDao.getPrice());
-                        showTicketVo.setType(ticketAndStatusDao.getType());
+                        showTicketVo.setType(ticketAndStatusDao.getType()==1?"单日票":"通票");
                         showTicketVo.setUseEnd(ticketAndStatusDao.getUseEnd());
                         showTicketVo.setUseStart(ticketAndStatusDao.getUseStart());
                         showTicketVo.setTotalGeneral(ticketAndStatusDao.getTotalGeneral());
@@ -335,6 +344,22 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
         return AjaxResult.success();
     }
 
+    @Override
+    public AjaxResult updateRedis() {
+        try {
+            String perIds = (String) smileRedisUtils.get(SmileRedisConst.SMILE_SHOW);
+            if(StringUtils.isNotBlank(perIds)){
+                List<String> list = new ArrayList<>(Arrays.asList(perIds.split(",")));
+                smileRedisUtils.setShowIds(list);
+            }
+        } catch (Exception e) {
+            log.error("updateRedis()");
+        }
+        ArrayList<String> showIds = (ArrayList<String>) smileRedisUtils.getShowIds().stream().distinct().collect(Collectors.toList());
+        smileRedisUtils.setShowIds(showIds);
+        return AjaxResult.success(showIds);
+    }
+
     private UserData getUserData(String performancesId, SmileUser smileUser, Map<String, SmileAgent> map, List<TicketAndStatusDao> smileAgentList) {
         UserData userData = new UserData();
         //个人用户的演出数据详情

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileUserServiceImpl.java

@@ -117,7 +117,7 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
 
     @Override
     public AjaxResult updateUserStateById(String uid, Integer state) {
-        SmileUserVO smileUserVO = getSmileUserVOFromRedis(uid);
+        SmileUserVO smileUserVO = getSmileUserVO(uid);
         //修改黑名单
         smileUserMapper.updateUserStateById(uid, state);
         updateRedisSetUser(smileUserVO, uid, state);
@@ -140,8 +140,8 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
 
     @Override
     public AjaxResult updateUserCheckById(SmileUserCheckVo smileUserCheckVo) {
-        //根据uid查询redis中的用户缓存信息
-        SmileUserVO smileUserVO = getSmileUserVOFromRedis(smileUserCheckVo.getUid());
+        //根据uid查询用户信息
+        SmileUserVO smileUserVO = getSmileUserVO(smileUserCheckVo.getUid());
         if (!smileUserVO.getType().equals(0)) {
             return AjaxResult.warn("已审核");
         }
@@ -212,10 +212,11 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
                 smileOrganization.getAgentId());
     }
 
-    private SmileUserVO getSmileUserVOFromRedis(String uid) {
+    private SmileUserVO getSmileUserVO(String uid) {
         //根据uid查询用户
         LambdaQueryWrapper<SmileUser> userQueryWrapper = Wrappers.lambdaQuery(SmileUser.class);
         userQueryWrapper.eq(SmileUser::getUid, uid);
+        userQueryWrapper.eq(SmileUser::getDelTag,0);
         SmileUser smileUser = smileUserMapper.selectOne(userQueryWrapper);
         SmileUserVO smileUserVO = new SmileUserVO();
         BeanUtils.copyProperties(smileUser, smileUserVO);
@@ -264,9 +265,10 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
             smileUserVO.setErrorReason(reason);
         }
         smileUserVO.setType(4);
-        SmileUserVO redisData = smileRedisUtils.getSmileUserVO(uid);
+//        SmileUserVO redisData = smileRedisUtils.getSmileUserVO(uid);
         //存入redis中
-        smileUserVO.setAuthStatus(redisData.getAuthStatus());
+//        smileUserVO.setAuthStatus(redisData.getAuthStatus());
+        smileUserVO.setAuthStatus(0);
         smileRedisUtils.setSmileUserVO(uid, smileUserVO);
     }
 }
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileVolunteersProjectServiceImpl.java

@@ -15,6 +15,7 @@ import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.smile.entity.SmileProjectTeamRelation;
 import com.liquidnet.service.smile.entity.SmileVolunteersProject;
 import com.liquidnet.service.smile.entity.SmileVolunteersTeam;
+import com.liquidnet.service.smile.entity.dto.SmileVolunteersProjectListDto;
 import com.liquidnet.service.smile.mapper.SmileProjectTeamRelationMapper;
 import com.liquidnet.service.smile.mapper.SmileVolunteersProjectMapper;
 import com.liquidnet.service.smile.mapper.SmileVolunteersTeamMapper;
@@ -44,15 +45,15 @@ public class SmileVolunteersProjectServiceImpl extends ServiceImpl<SmileVoluntee
     SmileRedisUtils redisUtils;
 
     @Override
-    public List<SmileVolunteersProject> list(SmileVPSParam param) {
+    public List<SmileVolunteersProjectListDto> list(SmileVPSParam param) {
         try {
-            TableDataInfo rspData = new TableDataInfo();
-            LambdaQueryWrapper<SmileVolunteersProject> wrappers = Wrappers.lambdaQuery(SmileVolunteersProject.class);
-            if (param.getTitle() != null && !param.getTitle().equals("")) {
-                wrappers.like(SmileVolunteersProject::getTitle, param.getTitle());
-            }
-            wrappers.orderByDesc(SmileVolunteersProject::getCreatedAt);
-            List<SmileVolunteersProject> data = volunteersProjectMapper.selectList(wrappers);
+//            LambdaQueryWrapper<SmileVolunteersProject> wrappers = Wrappers.lambdaQuery(SmileVolunteersProject.class);
+//            if (param.getTitle() != null && !param.getTitle().equals("")) {
+//                wrappers.like(SmileVolunteersProject::getTitle, param.getTitle());
+//            }
+//            wrappers.orderByDesc(SmileVolunteersProject::getCreatedAt);
+//            List<SmileVolunteersProject> data = volunteersProjectMapper.selectList(wrappers);
+            List<SmileVolunteersProjectListDto> data = volunteersProjectMapper.selectProjectList(param.getTitle());
             return data;
         } catch (Exception e) {
             e.printStackTrace();

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileVolunteersServiceImpl.java

@@ -78,9 +78,11 @@ public class SmileVolunteersServiceImpl extends ServiceImpl<SmileVolunteersMappe
             map.put("name", param.getName());
             map.put("phone", param.getPhone());
             map.put("team", param.getTeam());
+            map.put("teamAudit", param.getTeamAudit());
             map.put("title", param.getTitle() == null ? "" : param.getTitle());
             map.put("status", param.getStatus() + "");
             map.put("projectId", param.getProjectId());
+            map.put("sex", param.getSex().toString());
             List<VolunteersExportDto> dtoList = volunteersMapper.expertVolunteer(map);
             return dtoList;
         } catch (Exception e) {
@@ -160,6 +162,8 @@ public class SmileVolunteersServiceImpl extends ServiceImpl<SmileVolunteersMappe
         map.put("team", param.getTeam());
         map.put("title", param.getTitle() == null ? "" : param.getTitle());
         map.put("status", param.getStatus() + "");
+        map.put("sex", param.getSex().toString());
+        map.put("teamAudit", param.getTeamAudit());
         map.put("projectId", param.getProjectId());
         List<VolunteersExportDto> dtoList = volunteersMapper.expertVolunteer(map);
         List<VolunteersExportVo> voList = new ArrayList();

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

@@ -10,14 +10,19 @@ import com.liquidnet.service.goblin.dto.vo.SmileSchoolVo;
 import com.liquidnet.service.goblin.dto.vo.SmileSellDataVO;
 import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.smile.entity.SmileVolunteersTeam;
+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.Component;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 @Component
+@Slf4j
 public class SmileRedisUtils {
 
     @Autowired
@@ -28,6 +33,10 @@ public class SmileRedisUtils {
         return redisDataSourceUtil.getRedisSweetUtil();
     }
 
+    public Object get(String key){
+        return redisDataSourceUtil.getRedisSweetUtil().get(key);
+    }
+
     /**
      * redis保存用户
      */
@@ -49,6 +58,13 @@ public class SmileRedisUtils {
         return (String) redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
     }
 
+    /**
+     * 根据学校id删除学校
+     */
+    public void delSchoolNameById(String schoolId) {
+        redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SMILE_SCHOOL.concat(":").concat(schoolId));
+    }
+
     /**
      * 保存/更新学校
      */
@@ -63,6 +79,20 @@ public class SmileRedisUtils {
         redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_SCHOOL, smileSchoolVos);
     }
 
+    /**
+     * 删除缓存学校集合
+     */
+    public void delSchoolAll() {
+        redisDataSourceUtil.getRedisSweetUtil().del(SmileRedisConst.SMILE_SCHOOL);
+    }
+
+    /**
+     * 获取全部学校
+     */
+    public List<SmileSchoolVo> getSchoolAll() {
+       return (List<SmileSchoolVo>)redisDataSourceUtil.getRedisSweetUtil().get(SmileRedisConst.SMILE_SCHOOL);
+    }
+
     /**
      * 删除学校
      */
@@ -80,10 +110,44 @@ public class SmileRedisUtils {
     /**
      * 保存演出ids
      */
-    public void setShowIds(String perId) {
+    public void setShowIds(List<String> perId) {
         redisDataSourceUtil.getRedisSweetUtil().set(SmileRedisConst.SMILE_SHOW, perId);
     }
 
+    /**
+     * 获取演出ids
+     */
+    public List<String> getShowIds(){
+        String rdk = SmileRedisConst.SMILE_SHOW;
+        Object obj = getRedis().get(rdk);
+        if (obj == null) {
+            return CollectionUtil.arrayListString();
+        } else {
+            return (List<String>) obj;
+        }
+    }
+
+    public void delShow(){
+        String rdk = SmileRedisConst.SMILE_SHOW;
+        Object obj = getRedis().get(rdk);
+        if (obj != null) {
+            try {
+                List<String> obj1 = (List<String>) obj;
+            } catch (Exception e) {
+                log.debug("不是新存ids，需要删除！");
+                getRedis().del(rdk);
+
+                ArrayList<String> arrayList = CollectionUtil.arrayListString();
+                //旧版转换
+                String perforManceIds = (String) obj;
+                if (StringUtils.isNotBlank(perforManceIds)) {
+                    arrayList.addAll(Arrays.asList(perforManceIds.split(",")));
+                }
+                setShowIds(arrayList);
+            }
+        }
+    }
+
     /**
      * 保存个人打款
      */

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisUtil.java

@@ -34,7 +34,7 @@ public final class RedisUtil extends AbstractRedisUtil{
 
     public static void main(String[] args) {
         String[] keys = {
-                "kylin:member:uid:809406",
+                "smile:school",
         };
         for (String key : keys) {
             long value = key.hashCode();

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/dto/GoblinNftExCodeNumDto.java

+package com.liquidnet.service.goblin.dto;
+
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class GoblinNftExCodeNumDto {
+    private String activityId;
+    private String storeId;
+    private String spuId;
+    private String skuId;
+    private String unbox;
+    private LocalDateTime exStartTime;
+    private LocalDateTime exStopTime;
+    private Integer num;
+    private String boxSkuId;
+}

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/dto/PlatformGoblinNftOrderNotPayDto.java

+package com.liquidnet.service.goblin.dto;
+
+import lombok.Data;
+
+@Data
+public class PlatformGoblinNftOrderNotPayDto {
+    private String skuId;
+    private String listId;
+    private int notPayNum;
+}

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinNftExActivity.java

@@ -37,6 +37,11 @@ public class GoblinNftExActivity implements Serializable,Cloneable {
      */
     private String title;
 
+    /**
+     * 延期后的新活动id
+     */
+    private String newActivityId;
+
     /**
      * 创建时间
      */

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/entity/GoblinNftExCodeTask.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
+
+import com.liquidnet.service.goblin.dto.GoblinNftExCodeNumDto;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -60,6 +62,23 @@ public class GoblinNftExCodeTask implements Serializable {
         }
     }
 
+    public GoblinNftExCodeTask copy(GoblinNftExCodeNumDto vo) {
+        if (null == vo) return this;
+
+        this.setActivityId(vo.getActivityId());
+        this.setStoreId(vo.getStoreId());
+        this.setSpuId(vo.getSpuId());
+        this.setSkuId(vo.getSkuId());
+        this.setUnbox(vo.getUnbox());
+        this.setExStock(vo.getNum());
+        this.setExLimit(0);
+        this.setExStartTime(vo.getExStartTime());
+        this.setExStopTime(vo.getExStopTime());
+        this.setTyp(1);
+
+        return this;
+    }
+
 
 
 }

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/mapper/GoblinNftExSkuMapper.java

 package com.liquidnet.service.goblin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.goblin.dto.GoblinNftExCodeNumDto;
 import com.liquidnet.service.goblin.entity.GoblinNftExSku;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
@@ -32,4 +33,8 @@ public interface GoblinNftExSkuMapper extends BaseMapper<GoblinNftExSku> {
      * @return
      */
     List<GoblinNftExSku> selectGoblinNftExSkuByActivityIds(@Param("activityIds")String activityIds);
+
+    List<GoblinNftExCodeNumDto> selectExCodeNumAll(@Param("oldActivityId") String oldActivityId);
+    List<GoblinNftExCodeNumDto> selectExCodeNumBox(@Param("oldActivityId") String oldActivityId, @Param("skuId") String skuId);
+
 }

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/mapper/GoblinNftOrderMapper.java

 package com.liquidnet.service.goblin.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.goblin.dto.PlatformGoblinNftOrderNotPayDto;
 import com.liquidnet.service.goblin.dto.admin.GoblinNftOrderListDto;
 import com.liquidnet.service.goblin.entity.GoblinNftOrder;
 
@@ -19,4 +20,5 @@ public interface GoblinNftOrderMapper extends BaseMapper<GoblinNftOrder> {
 
     List<GoblinNftOrderListDto> searchList(Map<String, Object> convertBeanToMap);
 
+    List<PlatformGoblinNftOrderNotPayDto> selectOrderList();
 }

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinNftExActivityMapper.xml

@@ -6,6 +6,7 @@
         <result column="activity_id" property="activityId" jdbcType="VARCHAR"/>
         <result column="uid" property="uid" jdbcType="VARCHAR"/>
         <result column="title" property="title" jdbcType="VARCHAR"/>
+        <result column="new_activity_id" property="newActivityId" jdbcType="VARCHAR"/>
         <result column="created_at" property="createdAt" jdbcType="TIMESTAMP"/>
         <result column="updated_at" property="updatedAt" jdbcType="TIMESTAMP"/>
     </resultMap>
@@ -17,7 +18,7 @@
     </select>
 
     <select id="selectPageList" resultMap="BaseResult">
-        select activity_id,uid,title,created_at from goblin_nft_ex_activity
+        select activity_id,uid,title,created_at,new_activity_id from goblin_nft_ex_activity
         <where>
             <if test="uid != null and uid != ''">
                 and uid = #{uid,jdbcType=VARCHAR}
@@ -37,7 +38,7 @@
     </select>
 
     <select id="selectByActivityId" resultMap="BaseResult">
-        select activity_id, title, created_at
+        select activity_id, title, new_activity_id,created_at
         from goblin_nft_ex_activity
         where activity_id = #{activityId,jdbcType=VARCHAR}
     </select>

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinNftExSkuMapper.xml

@@ -17,14 +17,39 @@
 
     <select id="selectGoblinNftExSkuByActivityIds" resultMap="BaseResult">
         select activity_id,sku_id,unbox,store_id,ex_start_time,ex_stop_time from goblin_nft_ex_sku where
-            activity_id in
-            <foreach collection="activityIds.split(',')" item="activityId" open="(" separator="," close=")" >
-                #{activityId,jdbcType=VARCHAR}
-            </foreach>
+        activity_id in
+        <foreach collection="activityIds.split(',')" item="activityId" open="(" separator="," close=")">
+            #{activityId,jdbcType=VARCHAR}
+        </foreach>
+    </select>
+    <select id="selectExCodeNumAll" resultType="com.liquidnet.service.goblin.dto.GoblinNftExCodeNumDto">
+        select gnes.activity_id, gnes.store_id, gnes.spu_id, gnes.sku_id, gnes.unbox, gnes.ex_start_time, gnes.ex_stop_time, count(*) as num, gnec.box_sku_id
+        from goblin_nft_ex_sku as gnes
+        left join goblin_nft_ex_code as gnec on gnes.activity_id = gnec.activity_id and gnes.sku_id =
+        gnec.sku_id
+        <where>
+            gnes.activity_id = #{oldActivityId}
+            and (gnec.state = 3 or (gnec.state = 1 and gnes.ex_stop_time <![CDATA[<]]> NOW()))
+            group by gnes.sku_id
+        </where>
+    </select>
+    <select id="selectExCodeNumBox" resultType="com.liquidnet.service.goblin.dto.GoblinNftExCodeNumDto">
+        select gnes.activity_id, gnes.store_id, gnes.spu_id, gnes.sku_id, gnes.unbox, gnes.ex_start_time, gnes.ex_stop_time, count(*) as num, gnec.box_sku_id
+        from goblin_nft_ex_sku as gnes
+        left join goblin_nft_ex_code as gnec on gnes.activity_id = gnec.activity_id and gnes.sku_id =
+        gnec.sku_id
+        <where>
+            gnes.activity_id = #{oldActivityId}
+            and gnes.sku_id = #{skuId}
+            and (gnec.state = 3 or (gnec.state = 1 and gnes.ex_stop_time <![CDATA[<]]> NOW()))
+            and gnes.unbox = '1'
+            group by gnec.box_sku_id
+        </where>
     </select>
 
     <insert id="addGoblinNftExSkus">
-        insert into goblin_nft_ex_sku (activity_id,spu_id,sku_id,store_id,unbox,ex_stock,ex_limit,ex_start_time,ex_stop_time,created_at)
+        insert into goblin_nft_ex_sku
+        (activity_id,spu_id,sku_id,store_id,unbox,ex_stock,ex_limit,ex_start_time,ex_stop_time,created_at)
         values
         <foreach collection="goblinNftExSkus" item="goblinNftExSku" separator=",">
             (

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinNftOrderMapper.xml

@@ -55,4 +55,18 @@
         -- order by a.created_at desc
         order by a.mid desc
     </select>
+    <select id="selectOrderList" resultType="com.liquidnet.service.goblin.dto.PlatformGoblinNftOrderNotPayDto">
+        select sku_id,
+               list_id,
+               sum(if(status = 1, num, 0)) as notPayNum
+--             # select status, created_at,pay_time,updated_at,cancel_time,sku_id,list_id
+        from goblin_nft_order
+        where 1 > 0
+--             # and sku_title = '正在现场盲盒  正在现场盲盒'
+          and pay_type != 'EXCODE'
+--             #     and status = 3
+          and created_at > DATE_SUB(NOW(), INTERVAL 10 MINUTE)
+--             #   and created_at > DATE_SUB('2022-06-07 12:10:24', INTERVAL 10 MINUTE)
+        group by sku_id, list_id;
+    </select>
 </mapper>

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinPerformancesMapper.xml

@@ -717,6 +717,7 @@ GROUP BY user_mobile;
                  left join kylin_ticket_relations as ktr on ktr.times_id = kttr.times_id
                  inner join kylin_ticket_status as kts on kts.ticket_id = ktr.ticket_id
         where kts.is_agent = 1
+          AND kp.performances_id IN ( SELECT sa.performance_id FROM smile_agent sa WHERE sa.del_tag = 0 GROUP BY sa.performance_id )
         group by kp.performances_id
         order by kp.comment desc, kp.time_start asc
     </select>

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/dto/SmileVolunteersProjectListDto.java

+package com.liquidnet.service.smile.entity.dto;
+
+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>
+ * 志愿者-志愿者项目表
+ * </p>
+ *
+ * @author jiangxiulong
+ * @since 2022-04-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class SmileVolunteersProjectListDto implements Serializable, Cloneable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 活动id
+     */
+    private String projectId;
+
+    /**
+     * 项目名称
+     */
+    private String title;
+
+    /**
+     * 开始时间
+     */
+    private LocalDateTime timeStart;
+
+    /**
+     * 结束时间
+     */
+    private LocalDateTime timeEnd;
+
+    /**
+     * 状态[1-上线|0-下线]
+     */
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdAt;
+
+    /**
+     * 活动状态 [1开始|2结束]
+     */
+    private Integer timeStatus;
+    /**
+     * 报名人数
+     */
+    private Integer all;
+
+    /**
+     * 待审核人数
+     */
+    private Integer unAudit;
+
+    /**
+     * 审核人数
+     */
+    private Integer audit;
+
+    /**
+     * 拒绝人数
+     */
+    private Integer refuse;
+
+    private static final SmileVolunteersProjectListDto obj = new SmileVolunteersProjectListDto();
+
+    public static SmileVolunteersProjectListDto getNew() {
+        try {
+            return (SmileVolunteersProjectListDto) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SmileVolunteersProjectListDto();
+        }
+    }
+}

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/dto/VolunteersExportDto.java

@@ -23,6 +23,7 @@ public class VolunteersExportDto implements Serializable, Cloneable {
     private String team1;
     private String team2;
     private String team3;
+    private String teamAudit;
     private String introduce;
 
     private static final VolunteersExportDto obj = new VolunteersExportDto();

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/mapper/SmileAgentMapper.java

@@ -29,4 +29,6 @@ public interface SmileAgentMapper extends BaseMapper<SmileAgent> {
     Map getUserOrgByPerIdAndUidAndAgentMaster(@Param("performancesId") String performancesId,@Param("uid") String uid,@Param("ticketId") String ticketId);
 
     List<SmileAgentDao> selectAgentList(@Param("performancesId") String performancesId);
+
+    List<SmileAgent> selectAgentCarryGtZeroByPerId(@Param("performancesId")String performancesId);
 }

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/mapper/SmileVolunteersProjectMapper.java

@@ -2,6 +2,9 @@ package com.liquidnet.service.smile.mapper;
 
 import com.liquidnet.service.smile.entity.SmileVolunteersProject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.liquidnet.service.smile.entity.dto.SmileVolunteersProjectListDto;
+
+import java.util.List;
 
 /**
  * <p>
@@ -15,4 +18,5 @@ public interface SmileVolunteersProjectMapper extends BaseMapper<SmileVolunteers
 
     void getDetailsById(String projectId);
 
+    List<SmileVolunteersProjectListDto> selectProjectList(String title);
 }

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileAgentMapper.xml

@@ -108,4 +108,13 @@
           AND sa.del_tag = 0
     </select>
 
+    <select id="selectAgentCarryGtZeroByPerId" resultType="com.liquidnet.service.smile.entity.SmileAgent">
+        SELECT id,
+               performance_id,
+               ticket_id
+        FROM smile_agent
+        WHERE performance_id = #{performancesId}
+          AND del_tag = 0
+    </select>
+
 </mapper>

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileSchoolMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.liquidnet.service.smile.mapper.SmileSchoolMapper">
 
     <select id="selectListLimit" resultType="com.liquidnet.service.smile.entity.SmileSchool">
-        select id,name from smile_school where  `del_tag` = 0;
+        select id,name from smile_school where  `del_tag` = 0 LIMIT 20;
     </select>
 
     <select id="selectSchoolList" parameterType="java.util.Map" resultType="com.liquidnet.service.smile.entity.SmileSchool">

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileUserMapper.xml

@@ -161,7 +161,7 @@
                address
 
         FROM smile_user su
-                 LEFT JOIN kylin_order_ticket_relations AS kotr ON kotr.agent_id = su.uid
+                 LEFT JOIN kylin_order_ticket_relations AS kotr ON kotr.agent_id = su.uid  OR kotr.agent_id_master = su.uid
         WHERE kotr.performance_id = #{performancesId}
         group by uid
     </select>

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileVolunteersMapper.xml

@@ -20,6 +20,7 @@
         <result column="team1Name" property="team1"/>
         <result column="team2Name" property="team2"/>
         <result column="team3Name" property="team3"/>
+        <result column="teamAudit" property="teamAudit"/>
         <result column="introduce" property="introduce"/>
     </resultMap>
 
@@ -49,12 +50,15 @@
         svt1.name as 'team1Name',
         svt2.name as 'team2Name',
         svt3.name as 'team3Name',
+        t.name as 'teamAudit',
         sv.introduce
         from smile_volunteers as sv
         inner join smile_volunteers_project as svp on svp.project_id = sv.project_id
         left join smile_volunteers_team as svt1 on svt1.team_id = sv.team_id1
         left join smile_volunteers_team as svt2 on svt2.team_id = sv.team_id2
         left join smile_volunteers_team as svt3 on svt3.team_id = sv.team_id3
+        left join (select a.uid,b.name,a.project_id from smile_volunteers_team_relation as a inner join smile_volunteers_team as b on a.team_id = b.team_id) as t
+        on sv.uid = t.uid and sv.project_id = t.project_id
         <where>
             <if test="title!=''">
                 AND svp.title like concat('%',#{title},'%')
@@ -73,9 +77,15 @@
             <if test="status!='-1'">
                 AND sv.status = #{status}
             </if>
+            <if test="sex!='-1'">
+                AND sex = #{sex}
+            </if>
             <if test="team!=''">
                 AND (svt1.name = #{team} OR svt2.name = #{team} OR svt3.name = #{team})
             </if>
+            <if test="teamAudit!=''">
+                AND t.name = #{teamAudit}
+            </if>
         </where>
         ORDER BY sv.created_at desc
     </select>

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileVolunteersProjectMapper.xml

@@ -2,6 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.liquidnet.service.smile.mapper.SmileVolunteersProjectMapper">
 
+
+    <resultMap id="smileVolunteersProjectListDto" type="com.liquidnet.service.smile.entity.dto.SmileVolunteersProjectListDto">
+        <result column="project_id" property="projectId"/>
+        <result column="title" property="title"/>
+        <result column="status" property="status"/>
+        <result column="time_start" property="timeStart"/>
+        <result column="time_end" property="timeEnd"/>
+        <result column="created_at" property="createdAt"/>
+        <result column="time_status" property="timeStatus"/>
+        <result column="all" property="all"/>
+        <result column="un_audit" property="unAudit"/>
+        <result column="audit" property="audit"/>
+        <result column="refuse" property="refuse"/>
+    </resultMap>
+
     <select id="selectUserList" resultType="com.liquidnet.service.smile.entity.SmileUser">
         select * from smile_user
         <where>
@@ -13,4 +28,29 @@
         ORDER BY id desc
     </select>
 
+
+    <select id="selectProjectList" resultType="com.liquidnet.service.smile.entity.dto.SmileVolunteersProjectListDto">
+    select a.project_id,
+    title,
+    a.time_start,
+    a.time_end,
+    a.created_at,
+        a.status,
+    IF(now() >time_end,2,1) as 'time_status',
+    count(b0.project_id) + count(b1.project_id) + count(b2.project_id) as 'all',
+    count(b0.project_id)                                               as 'un_audit',
+    count(b1.project_id)                                               as 'audit',
+    count(b2.project_id)                                               as 'refuse'
+    from smile_volunteers_project as a
+    LEFT JOIN smile_volunteers as b0 on a.project_id = b0.project_id and b0.status = 0
+    LEFT JOIN smile_volunteers as b1 on a.project_id = b1.project_id and b1.status = 1
+    LEFT JOIN smile_volunteers as b2 on a.project_id = b2.project_id and b2.status = 2
+        <where>
+            <if test="title!='' and title !=null">
+                AND title Like concat('%',#{title},'%')
+            </if>
+        </where>
+    GROUP BY a.project_id
+    ORDER BY a.created_at desc
+    </select>
 </mapper>

liquidnet-bus-feign/liquidnet-api-feign-platform/src/main/java/com/liquidnet/service/feign/platform/task/FeignPlatformGoblinTaskClient.java

@@ -4,6 +4,7 @@ import com.liquidnet.service.base.ResponseDto;
 import feign.hystrix.FallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 
@@ -30,4 +31,6 @@ public interface FeignPlatformGoblinTaskClient {
     ResponseDto<String> codeCount();
 
 
+    @GetMapping("task/nft/order/notPayNum")
+    ResponseDto<String> getNotPayNum();
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java

@@ -584,6 +584,12 @@ public class AdamMemberOrderServiceImpl implements IAdamMemberOrderService {
                     .setSignName(SmsEnum.ADSignName.M01.getVal()).setTemplateCode(SmsEnum.ADTemplate.SMS_232908714.name()).toJson()
             );
             log.debug("#MQ耗时:{}ms", System.currentTimeMillis() - s);
+
+            try {
+                HttpUtil.get(serviceKylinUrl + "/inner/cache/member/".concat(currentUid), CollectionUtil.linkedMultiValueMapStringString());
+            } catch (Exception e) {
+                log.error("兑换会员成功:同步Kylin会员缓存异常[UID={},URL={}]", currentUid, serviceKylinUrl, e);
+            }
         } catch (Exception e) {
             log.error("会员兑换发生异常[memberCodeVo={}]", JsonUtils.toJson(memberCodeVo), e);
 

liquidnet-bus-service/liquidnet-service-executor-all/liquidnet-service-executor-main/src/main/java/com/liquidnet/service/executor/main/handler/PlatformGoblinTaskHandler.java

@@ -53,4 +53,14 @@ public class PlatformGoblinTaskHandler {
         }
     }
 
+    @XxlJob(value = "sev-platform:getNotPayNum")
+    public void getNotPayNum() {// 查询待支付订单数量
+        try {
+            XxlJobHelper.handleSuccess("结果：" + feignPlatformGoblinTaskClient.getNotPayNum().toJson());
+        } catch (Exception e) {
+            XxlJobHelper.log(e);
+            XxlJobHelper.handleFail();
+        }
+    }
+
 }

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/docu/db_0418_jxl_nft_exchange.sql

@@ -38,6 +38,8 @@ CREATE TABLE `goblin_nft_ex_activity`
     PRIMARY KEY (`mid`) USING BTREE,
     INDEX         `idx_nft_activity_id`(`activity_id`) USING BTREE
 ) ENGINE = InnoDB AUTO_INCREMENT = 1 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci COMMENT = 'NFT兑换活动表' ROW_FORMAT = Dynamic;
+ALTER TABLE `goblin_nft_ex_activity` ADD `new_activity_id` varchar(64) NOT NULL DEFAULT '' COMMENT '延期后的新活动id' after title;
+
 
 
 

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

@@ -142,8 +142,12 @@ public class GoblinNftGoodsAppServiceImpl implements IGoblinNftGoodsAppService {
 
     @Override
     public GoblinNftGoodsSkuInfoVo goodsDetail(String skuId) {
+        // 1
         LocalDateTime now = LocalDateTime.now();
         HashMap<String, Object> map = goblinRedisUtils.getGoodsSkuInfoVo(now, skuId);
+        if (null == map) {
+            return null;
+        }
         GoblinGoodsSkuInfoVo skuInfoVo = (GoblinGoodsSkuInfoVo) map.get("vo");
         Integer tagType = (Integer) map.get("tagType");
         String listId = (String) map.get("listId");
@@ -180,9 +184,10 @@ public class GoblinNftGoodsAppServiceImpl implements IGoblinNftGoodsAppService {
             nftGoodsSkuInfoVo.setListId(listId);
             nftGoodsSkuInfoVo.setBaseSaleStartTime(baseSaleStartTime);
             nftGoodsSkuInfoVo.setNextSaleStartTime(nextSaleStartTime);
-
             // 是否开启兑换
             nftGoodsSkuInfoVo.setIsExchange(goblinRedisUtils.getIsExchange(skuId));
+            // 待支付订单数量
+            nftGoodsSkuInfoVo.setNotPayNum(goblinRedisUtils.getNotPayNum(skuId, listId));
             return nftGoodsSkuInfoVo;
         } else {
             return null;

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

@@ -813,6 +813,9 @@ public class GoblinRedisUtils {
      */
     public HashMap<String, Object> getGoodsSkuInfoVo(LocalDateTime now, String skuId) {
         GoblinGoodsSkuInfoVo vo = getGoodsSkuInfoVo(skuId);
+        if (null == vo) {
+            return null;
+        }
         HashMap<String, Object> map = CollectionUtil.mapStringObject();
         LocalDateTime nextSaleStartTime = null;
         if (null == vo.getSaleStartTime() || now.isAfter(vo.getSaleStartTime())) {//普通商品已开售
@@ -2087,6 +2090,19 @@ public class GoblinRedisUtils {
         }
     }
 
+    public int getNotPayNum(String skuId, String listId) {
+        String redisKey = GoblinRedisConst.REDIS_GOBLIN_NFT_NOT_PAY_NUM.concat(skuId);
+        if (null != listId) {
+            redisKey = redisKey.concat(":").concat(listId);
+        }
+        Object obj = redisUtil.get(redisKey);
+        if (obj == null) {
+            return 1;
+        } else {
+            return (int) obj;
+        }
+    }
+
     /**
      * private int skuType 商品类型[0-常规|1-数字藏品]
      * private String status 审核状态[0-初始编辑|1-审核中|2-审核不通过|3-审核通过];
@@ -2115,11 +2131,11 @@ public class GoblinRedisUtils {
         ) {// 可以返回库存
             // 外面只有盲盒才能请求进来 里面只有不是分批购才判断盲盒里藏品的开售时间
             if (null == listId) {
-                if (LocalDateTime.now().isAfter(info.getSaleStartTime())) {
+//                if (LocalDateTime.now().isAfter(info.getSaleStartTime())) {
                     return getSkuStock(listId, info.getSkuId());
-                } else {
-                    return 0;
-                }
+//                } else {
+//                    return 0;
+//                }
             } else {
                 return getSkuStock(listId, info.getSkuId());
             }

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

@@ -429,11 +429,11 @@ public class GoblinNftOrderUtils {
         ) {// 可以返回库存
             // 外面只有盲盒才能请求进来 里面只有不是分批购才判断盲盒里藏品的开售时间
             if (null == listId) {
-                if (LocalDateTime.now().isAfter(info.getSaleStartTime())) {
+//                if (LocalDateTime.now().isAfter(info.getSaleStartTime())) {
                     return goblinRedisUtils.getSkuStock(listId, info.getSkuId());
-                } else {
-                    return 0;
-                }
+//                } else {
+//                    return 0;
+//                }
             } else {
                 return goblinRedisUtils.getSkuStock(listId, info.getSkuId());
             }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/goblin/activity/GoblinNftExActivityController.java

 package com.liquidnet.service.platform.controller.goblin.activity;
 
-import com.github.pagehelper.PageInfo;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.liquidnet.service.base.ResponseDto;
-import com.liquidnet.service.goblin.dto.vo.GoblinNftExActivityVo;
 import com.liquidnet.service.goblin.dto.vo.GoblinNftSkuVo;
 import com.liquidnet.service.goblin.dto.vo.PageInfoVo;
+import com.liquidnet.service.goblin.param.GoblinNftExActivityDelayParam;
 import com.liquidnet.service.goblin.param.GoblinNftExActivityParam;
 import com.liquidnet.service.goblin.service.IGoblinNftExActivityService;
 import io.swagger.annotations.Api;
@@ -64,4 +63,11 @@ public class GoblinNftExActivityController {
         iGoblinNftExActivityService.excel(httpServletResponse, goblinNftExActivityParam);
     }
 
+    @ApiOperationSupport(order = 5)
+    @ApiOperation(value = "该活动下兑换码延期")
+    @PutMapping("delay")
+    public ResponseDto delay(@Valid @RequestBody GoblinNftExActivityDelayParam goblinNftExActivityDelayParam) {
+        return iGoblinNftExActivityService.delay(goblinNftExActivityDelayParam);
+    }
+
 }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/controller/goblin/task/PlatformGoblinNftOrderController.java

+package com.liquidnet.service.platform.controller.goblin.task;
+
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.goblin.dto.PlatformGoblinNftOrderNotPayDto;
+import com.liquidnet.service.goblin.mapper.GoblinNftOrderMapper;
+import com.liquidnet.service.platform.utils.GoblinRedisUtils;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * NFT订单相关定时任务
+ *
+ * @author jiangxiulng
+ */
+@Api(tags = "NFT订单相关定时任务")
+@Slf4j
+@RestController
+@RequestMapping("task/nft/order")
+public class PlatformGoblinNftOrderController {
+    @Autowired
+    private GoblinNftOrderMapper goblinNftOrderMapper;
+    @Autowired
+    private GoblinRedisUtils goblinRedisUtils;
+
+    @ApiOperation(value = "查询待支付订单数量")
+    @GetMapping("notPayNum")
+    public ResponseDto<String> getNotPayNum() {
+        List<PlatformGoblinNftOrderNotPayDto> goblinNftOrderList = goblinNftOrderMapper.selectOrderList();
+        for (PlatformGoblinNftOrderNotPayDto notPayDto : goblinNftOrderList) {
+            goblinRedisUtils.setNotPayNum(notPayDto.getSkuId(), notPayDto.getListId(), notPayDto.getNotPayNum());
+        }
+        return ResponseDto.success("查询待支付订单完成");
+    }
+}

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

@@ -335,7 +335,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
                     if (StringUtil.isNotBlank(gnc.getBoxSkuId()) && gnc.getSkuId().equals(goblinNftExSku.getSkuId())) {
                         gnc.setExStartTime(goblinNftExSku.getExStartTime());
                         gnc.setExStopTime(goblinNftExSku.getExStopTime());
-                        if (now.isAfter(goblinNftExSku.getExStopTime())) {
+                        if (now.isAfter(goblinNftExSku.getExStopTime()) && !gnc.getState().equals(2)) {
                             gnc.setState(3);
                         }
                         break;
@@ -343,7 +343,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
                         if (gnc.getSkuId().equals(goblinNftExSku.getSkuId())) {
                             gnc.setExStartTime(goblinNftExSku.getExStartTime());
                             gnc.setExStopTime(goblinNftExSku.getExStopTime());
-                            if (now.isAfter(goblinNftExSku.getExStopTime())) {
+                            if (now.isAfter(goblinNftExSku.getExStopTime()) && !gnc.getState().equals(2)) {
                                 gnc.setState(3);
                             }
                             break;
@@ -401,7 +401,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
                     }
                     phonestr.append(data.getPhone()).append(",");
                     phoneList.add(data.getPhone());
-                    if(phoneList.size()>100){
+                    if (phoneList.size() > 100) {
                         break;
                     }
                 }
@@ -412,7 +412,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
             return ResponseDto.failure("解析文件失败！");
         }
 
-        if(phoneList.size()>=100){
+        if (phoneList.size() >= 100) {
             return ResponseDto.failure("批量空投暂时数量不能大于100");
         }
 

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

@@ -119,14 +119,14 @@ public class GoblinNftExSkuServiceImpl implements IGoblinNftExSkuService {
                 }
 
                 // 判断开售、停售时间
-                LocalDateTime saleStartTime = goblinGoodsSku.getSaleStartTime();
+/*                LocalDateTime saleStartTime = goblinGoodsSku.getSaleStartTime();
                 LocalDateTime saleStopTime = goblinGoodsSku.getSaleStopTime();
                 LocalDateTime nowTime = LocalDateTime.now();
                 if (nowTime.isBefore(saleStartTime)) {
                     continue;
                 } else if (null != saleStopTime && nowTime.isAfter(saleStopTime)) {
                     continue;
-                }
+                }*/
 
                 //是否购买
                 if (!goblinGoodsSku.getSkuCanbuy().equals("1")) {

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

@@ -78,6 +78,10 @@ public class SellDataInfoImpl {
                     for(Map a:list1){
                         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()))){
+                            continue;
+                        }
                         //获取 该人 该演出 的所有订单
                         List<Map> list2=orderTicketsMapper.getUserSellOneDate(smileUser.getUid(),performanceId);
                         ArrayList<SellDataOneVO> listSellDataOneVo= ObjectUtil.getSellDataOneVOArrayList();
@@ -129,8 +133,11 @@ 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");
+                        }
                     }
+
                 }catch (Exception e){
                     log.info(String.valueOf(e));
                     log.info("用户的uid{}",smileUser.getUid());

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

@@ -292,6 +292,15 @@ public class GoblinRedisUtils {
 
     // 获取sku配置库存
 
+    // 设置skuId listId 代付款数量
+    public void setNotPayNum(String skuId, String listId, int notPayNum) {
+        String redisKey = GoblinRedisConst.REDIS_GOBLIN_NFT_NOT_PAY_NUM.concat(skuId);
+        if (!listId.isEmpty()) {
+            redisKey = redisKey.concat(":").concat(listId);
+        }
+        getRedis().set(redisKey, notPayNum);
+    }
+
 
 
 

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/docu/db_ln_goblin_initialdata.sql

@@ -39,7 +39,7 @@ CREATE TABLE `smile_user`  (
                                `id_card` varchar(18) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '身份证号',
                                `school_id` varchar(9) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '学校关联ID',
                                `school_name` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '学校名称',
-                               `school_major` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '专业',
+                               `school_major` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '专业',
                                `identity` int NULL DEFAULT NULL COMMENT '身份（1:在校学生（默认），2已毕业）',
                                `tag` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NULL DEFAULT NULL COMMENT '标识步骤',
                                `agent` int NULL DEFAULT NULL COMMENT '1：代理开启，2：代理关闭',

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/docu/mongo_db_ddl.sql

@@ -2,10 +2,13 @@ use test_ln_scene;
 // ================================================== 创建集合
 db.createCollection("SmileSellDataDetailVO");
 db.createCollection("SmileSellDataVO");
+db.createCollection("SmileSchoolVo");
 // ================================================== 创建索引
 db.SmileSellDataDetailVO.createIndex({dataId:"hashed"});
 db.SmileSellDataVO.createIndex({sellDataId:"hashed"});
+db.SmileSchoolVo.createIndex({schoolId:"hashed"})
  ================================================== 创建分片
 sh.enableSharding("test_ln_scene");
 sh.shardCollection("test_ln_scene.SmileSellDataDetailVO",{"dataId":"hashed"});
-sh.shardCollection("test_ln_scene.SmileSellDataVO",{"sellDataId":"hashed"});
+sh.shardCollection("test_ln_scene.SmileSellDataVO",{"sellDataId":"hashed"});
\ No newline at end of file
+sh.shardCollection("test_ln_scene.SmileSchoolVo",{"schoolId":"hashed"});
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/controller/SmileUserController.java

 package com.liquidnet.service.controller;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.liquidnet.commons.lang.util.CurrentUtil;
-import com.liquidnet.commons.lang.util.IdentityUtils;
-import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.commons.lang.util.StringUtil;
-import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.goblin.dto.vo.*;
 import com.liquidnet.service.goblin.service.manage.SmileFrontService;
@@ -16,7 +12,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.validation.BindingResult;
 import org.springframework.validation.ObjectError;
 import org.springframework.validation.annotation.Validated;
@@ -51,13 +46,21 @@ public class SmileUserController {
     }
     @GetMapping("getSchool")
     @ApiOperation("获得学校")
-    public ResponseDto<List<SmileSchoolVo>> getSchool() {
+    public ResponseDto<List<SmileSchoolVo>> getSchool(String name) {
        /* String userId = CurrentUtil.getCurrentUid();
         List<SmileSchoolVo> list=null;
         if(redisUtil.hasKey(SmileRedisConst.SMILE_SCHOOL)){
             list= (List<SmileSchoolVo>) redisUtil.get(SmileRedisConst.SMILE_SCHOOL);
         }*/
-        return ResponseDto.success(smileRedisUtils.getSchool());
+        if(StringUtil.isNotBlank(name)){
+            //mongodb  搜索
+            return ResponseDto.success(smileFrontService.getSchool(name));
+        }else{
+
+            return ResponseDto.success(smileRedisUtils.getSchool());
+        }
+
+
     }
     @GetMapping("getPerformance")
     @ApiOperation("获得演出列表")
@@ -96,17 +99,27 @@ public class SmileUserController {
         String userId = CurrentUtil.getCurrentUid();
         SmileUserVO smileUserVORedis=  smileRedisUtils.getSmileUserVo(userId);
         if(null!=smileUserVORedis){
-            if(smileUserVORedis.getAuthStatus()==1&&null!=smileUserVORedis.getType()&&(smileUserVORedis.getType()==1||smileUserVORedis.getType()==2)){
+            if(null!=smileUserVORedis.getType()&&(smileUserVORedis.getType()==1||smileUserVORedis.getType()==2)){
+                return ResponseDto.success(true);
+            }else if(smileUserVORedis.getAuthStatus()==1){
                 return ResponseDto.success(true);
-            } else{
+            }else{
+                if(!(smileUserVORedis.getTag().contains("1")&&smileUserVORedis.getTag().contains("2")&&smileUserVORedis.getTag().contains("3"))){
+                   return ResponseDto.failure("用户信息不全，请填写后提交认证");
+                }
+                //smileRedisUtils.setSmileUserVo(userId,smileUserVORedis);
                 if(null!=smileUserVORedis.getType()&&smileUserVORedis.getType()==4){
-                    smileFrontService.deleteUser(userId);
+                    /*smileFrontService.deleteUser(userId);*/
+                    smileUserVORedis.setAuthStatus(1);
+                    smileUserVORedis.setType(0);
+                    smileFrontService.auth(userId,smileUserVORedis,false);
+                }else{
+                    smileUserVORedis.setAuthStatus(1);
+                    smileUserVORedis.setType(0);
+                    smileFrontService.auth(userId,smileUserVORedis,true);
                 }
-                smileUserVORedis.setAuthStatus(1);
-                smileUserVORedis.setType(0);
-                smileRedisUtils.setSmileUserVo(userId,smileUserVORedis);
                 //redisUtil.set(SmileRedisConst.SMILE_USER.concat(userId),smileUserVORedis);
-                return ResponseDto.success(smileFrontService.auth(userId,smileUserVORedis));
+                return ResponseDto.success();
             }
         }
         return ResponseDto.failure("没有该用户信息");
@@ -132,6 +145,7 @@ public class SmileUserController {
             //说明已经验证过
             return ResponseDto.failure("用户状态不对");
         }
+        smileUserVO.setTag("1");
         smileFrontService.saveOrUpdateUser(smileUserVO,smileUserVORedis,"1");
         return  ResponseDto.success();
     }
@@ -148,6 +162,7 @@ public class SmileUserController {
         }
         if(StringUtil.isNotBlank(smileUserVO.getIdCard())&&StringUtil.isNotBlank(smileUserVO.getName())){
             String userId = CurrentUtil.getCurrentUid();
+          /*  String status=smileRedisUtils.getValidate(smileUserVO.getName(), smileUserVO.getIdCard());*/
             if(utils.validate(smileUserVO.getName(),smileUserVO.getIdCard())){
                 smileUserVO.setUid(userId);
                 SmileUserVO smileUserVORedis=smileRedisUtils.getSmileUserVo(userId);
@@ -155,6 +170,11 @@ public class SmileUserController {
                     //说明已经验证过
                     return ResponseDto.failure("用户状态不对");
                 }
+                smileUserVO.setTag("2");
+                //查看这个身份证有没有被用过
+              /*  if(StringUtil.isNotBlank(status)){
+                    return ResponseDto.failure("该身份证已经有账号绑定了！");
+                }*/
                 smileFrontService.saveOrUpdateUser(smileUserVO,smileUserVORedis,"2");
             }else {
                 return  ResponseDto.failure("验证身份证失败！");
@@ -181,6 +201,7 @@ public class SmileUserController {
             //说明已经验证过
             return ResponseDto.failure("用户状态不对");
         }
+        smileUserVO.setTag("3");
         smileFrontService.saveOrUpdateUser(smileUserVO,smileUserVORedis,"3");
         return  ResponseDto.success();
     }

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.service.impl;
 import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
+import com.liquidnet.service.goblin.dto.vo.SmileSchoolVo;
 import com.liquidnet.service.goblin.dto.vo.SmileSellDataDetailVO;
 import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.goblin.service.manage.SmileFrontService;
@@ -74,33 +75,33 @@ public class SmileFrontServiceImpl implements SmileFrontService {
         String sqlDatas = SqlMapping.gets(sqls, sqlData);
         queueUtils.sendMsgByRedis(MQConst.SmileQueue.SMILE_USER.getKey(), sqlDatas);
     }
- /*   public void updateUser(SmileUserVO smileUserVO){
+    public void updateUser(SmileUserVO smileUserVO){
         LinkedList<String> sqls = CollectionUtil.linkedListString();
         sqls.add(SqlMapping.get("smile_service.update_user"));
         LinkedList<Object[]> sqlData = CollectionUtil.linkedListObjectArr();
         sqlData.add(new Object[]{
                 smileUserVO.getImg(),smileUserVO.getName(),smileUserVO.getBirthday(),smileUserVO.getSex(),
-                smileUserVO.getPhone(),smileUserVO.getProvinceKey(),smileUserVO.getProvince(),smileUserVO.getCityKey(),smileUserVO.getCity(),
-                smileUserVO.getAreaKey(),smileUserVO.getArea(),smileUserVO.getAddress(),smileUserVO.getWechat(),smileUserVO.getType(),smileUserVO.getOrgId(),
+                smileUserVO.getPhone(),smileUserVO.getProvinceId(),smileUserVO.getProvince(),smileUserVO.getCityId(),smileUserVO.getCity(),
+                smileUserVO.getAreaId(),smileUserVO.getArea(),smileUserVO.getAddress(),smileUserVO.getWechat(),smileUserVO.getType(),smileUserVO.getOrgId(),
                 smileUserVO.getIdCard(),smileUserVO.getSchoolName(),smileUserVO.getSchoolMajor(),smileUserVO.getIdentity(),smileUserVO.getTag(),smileUserVO.getAgent(),
-                smileUserVO.getAuthTag(),smileUserVO.getErrorReason(),smileUserVO.getIntroduce(),smileUserVO.getSpecialty1(),smileUserVO.getSpecialty2(),
+                smileUserVO.getErrorReason(),smileUserVO.getIntroduce(),smileUserVO.getSpecialty1(),smileUserVO.getSpecialty2(),
                 smileUserVO.getSpecialty3(),smileUserVO.getState(),smileUserVO.getUpdatedDate(),smileUserVO.getSchoolId(),smileUserVO.getUid()
 
         });
         String sqlDatas = SqlMapping.gets(sqls, sqlData);
         queueUtils.sendMsgByRedis(MQConst.SmileQueue.SMILE_USER.getKey(), sqlDatas);
-    }*/
+    }
 
     public List<KylinPerformanceVo> getPerformance() {
         ArrayList<KylinPerformanceVo> list = ObjectUtil.kylinPerformanceVoList();
-      /*  List<String> list1= (List<String>) redisUtil.get(SmileRedisConst.SMILE_SHOW);
-        for(String s:list1){
-            KylinPerformanceVo kylinPerformanceVo=smileMongoUtils.getPerFormance(s);
-            if(null!=kylinPerformanceVo){
+        List<String> smileShow = smileRedisUtils.getSmileShow();
+        for(String id:smileShow){
+            KylinPerformanceVo kylinPerformanceVo = smileMongoUtils.getPerFormance(id);
+            if (null != kylinPerformanceVo && LocalDateTime.now().isBefore(LocalDateTime.parse(kylinPerformanceVo.getTimeEnd(), DTF_YMD_HMS))) {//演出结束不显示在列表
                 list.add(kylinPerformanceVo);
             }
-        }*/
-        String perforManceIds = smileRedisUtils.getSmileShow();
+        }
+        /*String perforManceIds = smileRedisUtils.getSmileShow();
         if (StringUtils.isNotBlank(perforManceIds)) {
             for (String id : perforManceIds.split(",")) {
                 KylinPerformanceVo kylinPerformanceVo = smileMongoUtils.getPerFormance(id);
@@ -108,7 +109,7 @@ public class SmileFrontServiceImpl implements SmileFrontService {
                     list.add(kylinPerformanceVo);
                 }
             }
-        }
+        }*/
         return list;
     }
 
@@ -125,8 +126,15 @@ public class SmileFrontServiceImpl implements SmileFrontService {
     }
 
     @Override
-    public boolean auth(String uid, SmileUserVO redisVo) {
-        insertUser(redisVo);
+    public boolean auth(String uid, SmileUserVO redisVo,boolean b) {
+        smileRedisUtils.setSmileUserVo(uid,redisVo);
+        if(b){
+            insertUser(redisVo);
+        }else{
+            redisVo.setUpdatedDate(LocalDateTime.now());
+            updateUser(redisVo);
+        }
+
         return true;
     }
 
@@ -159,6 +167,11 @@ public class SmileFrontServiceImpl implements SmileFrontService {
         return smileSellDataDetailVO;
     }
 
+    @Override
+    public List<SmileSchoolVo> getSchool(String name) {
+        return smileMongoUtils.getSchoole(name);
+    }
+
 
     public void setUser(SmileUserVO smileUserVO, SmileUserVO redisVo, String type) {
         if (type.equals("1")) {
@@ -176,7 +189,7 @@ public class SmileFrontServiceImpl implements SmileFrontService {
             redisVo.setSchoolId(smileUserVO.getSchoolId());
             redisVo.setSchoolMajor(smileUserVO.getSchoolMajor());
             redisVo.setIdentity(smileUserVO.getIdentity());
-            redisVo.setTag(smileUserVO.getTag());
+            redisVo.setTag(redisVo.getTag()+smileUserVO.getTag());
             redisVo.setUpdatedDate(LocalDateTime.now());
             redisVo.setUid(smileUserVO.getUid());
             redisVo.setDelTag(0);
@@ -190,15 +203,17 @@ public class SmileFrontServiceImpl implements SmileFrontService {
             redisVo.setUpdatedDate(LocalDateTime.now());
             redisVo.setUid(smileUserVO.getUid());
             redisVo.setDelTag(0);
+            redisVo.setTag(redisVo.getTag()+smileUserVO.getTag());
             //redisVo.setType(smileUserVO.getType());
         } else if (type.equals("3")) {
             redisVo.setIntroduce(smileUserVO.getIntroduce());
             redisVo.setSpecialty1(smileUserVO.getSpecialty1());
             redisVo.setSpecialty2(smileUserVO.getSpecialty2());
-            redisVo.setSpecialty3(smileUserVO.getSpecialty2());
+            redisVo.setSpecialty3(smileUserVO.getSpecialty3());
             redisVo.setUpdatedDate(LocalDateTime.now());
             redisVo.setUid(smileUserVO.getUid());
             redisVo.setDelTag(0);
+            redisVo.setTag(redisVo.getTag()+smileUserVO.getTag());
             //redisVo.setType(smileUserVO.getType());
         }
     }

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/util/SmileMongoUtils.java

 package com.liquidnet.service.util;
 
+import com.liquidnet.service.goblin.dto.vo.SmileSchoolVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -7,6 +8,8 @@ import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 @Component
 public class SmileMongoUtils {
     @Autowired
@@ -17,5 +20,12 @@ public class SmileMongoUtils {
                 KylinPerformanceVo.class, KylinPerformanceVo.class.getSimpleName());
     }
 
+    public List<SmileSchoolVo> getSchoole(String name){
+        Query query = new Query();
+        java.util.regex.Pattern pattern =
+                java.util.regex.Pattern.compile("^.*" + name + ".*$", java.util.regex.Pattern.CASE_INSENSITIVE);
+        query.addCriteria(Criteria.where("name").regex(pattern));
+        return mongoTemplate.find(query, SmileSchoolVo.class, SmileSchoolVo.class.getSimpleName());
+    }
 
 }

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/java/com/liquidnet/service/util/SmileRedisUtils.java

@@ -58,8 +58,16 @@ public class SmileRedisUtils {
     }
 
     /* ---------------------------------------- 演出列表数据 ---------------------------------------- */
-    public String getSmileShow() {
-        return (String) redisUtil.get(SmileRedisConst.SMILE_SHOW);
+    public List<String> getSmileShow() {
+        String rdk = SmileRedisConst.SMILE_SHOW;
+        Object obj = redisUtil.get(rdk);
+        if (obj == null) {
+            return CollectionUtil.arrayListString();
+        } else {
+            return (List<String>) obj;
+        }
+
+//        return (String) redisUtil.get(SmileRedisConst.SMILE_SHOW);
     }
 
     /* ---------------------------------------- 代理数据 ---------------------------------------- */

liquidnet-bus-service/liquidnet-service-smile/liquidnet-service-smile-impl/src/main/resources/sqlmap.properties

@@ -2,7 +2,7 @@
 goblin_service_support.insert_byreplace=REPLACE INTO goblin_service_support (ssid,name,`desc`,url,del_flg,created_by,created_at)VALUES(?,?,?,?,'0','-',sysdate()) 
 
 smile_service.insert_user= insert into smile_user(img,`name`,`uid`,birthday,sex,phone,province_id,province,city_id,city,area_id,area,address,wechat,`type`,org_id,id_card,school_name,school_major,`identity`,tag,agent,error_reason,introduce,specialty1,specialty2,specialty3,`state`,del_tag,created_date,updated_date,school_id) values (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
-smile_service.update_user=  update smile_user  set img =?,`name`=?,birthday=?,sex =?,phone=?,province_key=?,province=?,city_key =?,city=?,area_key=?,area =?,address =?,wechat =?,`type`=?,org_id =?,id_card=?,school_name =?,school_major =?,`identity`=?,tag =?,agent =?,auth_tag =?,error_reason =?,introduce =?,specialty1 =?,specialty2 =?,specialty3 =?,`state`=?,updated_date=?,school_id=? where `uid`=?
+smile_service.update_user=  update smile_user  set img =?,`name`=?,birthday=?,sex =?,phone=?,province_id=?,province=?,city_id =?,city=?,area_id=?,area =?,address =?,wechat =?,`type`=?,org_id =?,id_card=?,school_name =?,school_major =?,`identity`=?,tag =?,agent =?,error_reason =?,introduce =?,specialty1 =?,specialty2 =?,specialty3 =?,`state`=?,updated_date=?,school_id=? where `uid`=?
 smile_service.delete_user= delete from smile_user where uid=?
 
 

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

@@ -175,10 +175,17 @@ public class SweetAppletController {
                             }
                         }
                     }
-
+                    if(item.getTitle().contains("&")){
+                        item.setTitle(item.getTitle().split("&")[0]);
+                    }
                     returnArtist.add(item);
                 }
             }
+            data.getStage().forEach(t->{
+                if(t.getTitle().contains("&")){
+                    t.setTitle(t.getTitle().split("&")[0]);
+                }
+            });
 
             data.setData(returnArtist);
             data.setTotal(allReturnArtist.size());
@@ -311,6 +318,9 @@ public class SweetAppletController {
                         }
                     }
                 }
+                if(item.getTitle().contains("&")){
+                    item.setTitle(item.getTitle().split("&")[0]);
+                }
                 vo = item;
                 break;
             }

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

@@ -166,11 +166,19 @@ public class SweetAppletMdskController {
                             }
                         }
                     }
-
+                    if(item.getTitle().contains("&")){
+                        item.setTitle(item.getTitle().split("&")[0]);
+                    }
                     returnArtist.add(item);
                 }
             }
 
+            data.getStage().forEach(t->{
+                if(t.getTitle().contains("&")){
+                    t.setTitle(t.getTitle().split("&")[0]);
+                }
+            });
+
             data.setData(returnArtist);
             data.setTotal(allReturnArtist.size());
             return ResponseDto.success(data);
@@ -285,6 +293,9 @@ public class SweetAppletMdskController {
                         }
                     }
                 }
+                if(item.getTitle().contains("&")){
+                    item.setTitle(item.getTitle().split("&")[0]);
+                }
                 vo = item;
                 break;
             }

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

@@ -163,11 +163,19 @@ public class SweetAppletTFCController {
                             }
                         }
                     }
-
+                    if(item.getTitle().contains("&")){
+                        item.setTitle(item.getTitle().split("&")[0]);
+                    }
                     returnArtist.add(item);
                 }
             }
 
+            data.getStage().forEach(t->{
+                if(t.getTitle().contains("&")){
+                    t.setTitle(t.getTitle().split("&")[0]);
+                }
+            });
+
             data.setData(returnArtist);
             data.setTotal(allReturnArtist.size());
             return ResponseDto.success(data);
@@ -282,6 +290,9 @@ public class SweetAppletTFCController {
                         }
                     }
                 }
+                if(item.getTitle().contains("&")){
+                    item.setTitle(item.getTitle().split("&")[0]);
+                }
                 vo = item;
                 break;
             }

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

@@ -71,10 +71,18 @@ public class RedisArDataUtils {
                         artist.setResourceUrl(urlList);
                     }
                     for (SweetManualArtistStageListArDto stage : stageList) {
-                        stage.setEnTitle("");
+                        if(stage.getTitle().contains("&")){
+                            stage.setEnTitle(stage.getTitle().split("&")[1]);
+                            stage.setTitle(stage.getTitle().split("&")[0]);
+                        } else {
+                            stage.setEnTitle("");
+                        }
                         List<SweetManualArtistListArDto> artistListArList = new ArrayList<>();
                         for (SweetManualArtistListArDto artist : artistList) {
                             if (artist.getPerformanceStart().contains(time) && stage.getStageId().equals(artist.getStageId())) {
+                                if(artist.getTitle().contains("&")){
+                                    artist.setTitle(artist.getTitle().split("&")[0]);
+                                }
                                 artistListArList.add(artist);
                             }
                         }