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

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-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>-->

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

@@ -619,12 +619,17 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
                 smileRedisUtils.delAgent(performancesId,ticketId);
             }
 
+            //查询所有演出id
+//            List<String> showIds = smileRedisUtils.getShowIds();
+//            showIds.add(performancesId);
+//            smileRedisUtils.setShowIds(showIds);
 
-            List<String> collect = kylinPerformances.stream().map(KylinPerformances::getPerformancesId).collect(Collectors.toList());
+
+           /* List<String> collect = kylinPerformances.stream().map(KylinPerformances::getPerformancesId).collect(Collectors.toList());
             String perId = StringUtils.join(collect,",");
             if (!"".equals(perId)){
                 smileRedisUtils.setShowIds(perId);
-            }
+            }*/
             return true;
         } catch (Exception e) {
             return false;

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/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/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,10 @@ public class SmileAgentServiceImpl extends ServiceImpl<SmileAgentMapper, SmileAg
         }
         return AjaxResult.warn("演出未开启代理");
     }
+
+    @Override
+    @PostConstruct
+    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/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);
 
-        //获取排序演出id
+            return AjaxResult.success();
+        }else {
+            return AjaxResult.warn("清先为演出设置票提！");
+        }
+
+        /*//获取排序演出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/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保存用户
      */
@@ -80,10 +89,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:show",
         };
         for (String key : keys) {
             long value = key.hashCode();

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-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-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.constant.SmileRedisConst;
 import com.liquidnet.service.goblin.dto.vo.SmileSellDataDetailVO;
 import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
 import com.liquidnet.service.goblin.service.manage.SmileFrontService;
@@ -93,14 +94,14 @@ public class SmileFrontServiceImpl implements SmileFrontService {
 
     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;
     }
 

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);
     }
 
     /* ---------------------------------------- 代理数据 ---------------------------------------- */