修改 校园分销 演出列表 小程序端

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

@@ -26,6 +26,8 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import static com.liquidnet.commons.lang.util.DateUtil.DTF_YMD_HMS;
+
 @Service
 @Slf4j
 public class SmileFrontServiceImpl implements SmileFrontService {
@@ -37,34 +39,36 @@ public class SmileFrontServiceImpl implements SmileFrontService {
     QueueUtils queueUtils;
     @Autowired
     private MongoTemplate mongoTemplate;
-    public boolean saveOrUpdateUser(SmileUserVO smileUserVO,SmileUserVO redisVo,String type){
+
+    public boolean saveOrUpdateUser(SmileUserVO smileUserVO, SmileUserVO redisVo, String type) {
         //redis里面更新
-        if(null==redisVo){
+        if (null == redisVo) {
             smileUserVO.setCreatedDate(LocalDateTime.now());
             smileUserVO.setDelTag(0);
-            smileRedisUtils.setSmileUserVo(smileUserVO.getUid(),smileUserVO);
-           /// insertUser(smileUserVO);
+            smileRedisUtils.setSmileUserVo(smileUserVO.getUid(), smileUserVO);
+            /// insertUser(smileUserVO);
             //插入
-        }else{
+        } else {
             //update
-            setUser(smileUserVO,redisVo,type);
-            smileRedisUtils.setSmileUserVo(redisVo.getUid(),redisVo);
+            setUser(smileUserVO, redisVo, type);
+            smileRedisUtils.setSmileUserVo(redisVo.getUid(), redisVo);
             //updateUser(smileUserVO);
         }
         return true;
     }
-    public void insertUser(SmileUserVO smileUserVO){
+
+    public void insertUser(SmileUserVO smileUserVO) {
         smileUserVO.setType(0);
         LinkedList<String> sqls = CollectionUtil.linkedListString();
         sqls.add(SqlMapping.get("smile_service.insert_user"));
         LinkedList<Object[]> sqlData = CollectionUtil.linkedListObjectArr();
         sqlData.add(new Object[]{
-                smileUserVO.getImg(),smileUserVO.getName(),smileUserVO.getUid(),smileUserVO.getBirthday(),smileUserVO.getSex(),
-                smileUserVO.getPhone(),smileUserVO.getProvinceId(),smileUserVO.getProvince(),smileUserVO.getProvinceId(),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.getErrorReason(),smileUserVO.getIntroduce(),smileUserVO.getSpecialty1(),smileUserVO.getSpecialty2(),
-                smileUserVO.getSpecialty3(),0,smileUserVO.getDelTag(),smileUserVO.getCreatedDate(),smileUserVO.getUpdatedDate(),smileUserVO.getSchoolId()
+                smileUserVO.getImg(), smileUserVO.getName(), smileUserVO.getUid(), smileUserVO.getBirthday(), smileUserVO.getSex(),
+                smileUserVO.getPhone(), smileUserVO.getProvinceId(), smileUserVO.getProvince(), smileUserVO.getProvinceId(), 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.getErrorReason(), smileUserVO.getIntroduce(), smileUserVO.getSpecialty1(), smileUserVO.getSpecialty2(),
+                smileUserVO.getSpecialty3(), 0, smileUserVO.getDelTag(), smileUserVO.getCreatedDate(), smileUserVO.getUpdatedDate(), smileUserVO.getSchoolId()
 
         });
         String sqlDatas = SqlMapping.gets(sqls, sqlData);
@@ -87,8 +91,8 @@ public class SmileFrontServiceImpl implements SmileFrontService {
         queueUtils.sendMsgByRedis(MQConst.SmileQueue.SMILE_USER.getKey(), sqlDatas);
     }*/
 
-    public List<KylinPerformanceVo>  getPerformance(){
-        ArrayList<KylinPerformanceVo> list= ObjectUtil.kylinPerformanceVoList();
+    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);
@@ -96,11 +100,11 @@ public class SmileFrontServiceImpl implements SmileFrontService {
                 list.add(kylinPerformanceVo);
             }
         }*/
-        String perforManceIds= smileRedisUtils.getSmileShow();
-        if(StringUtils.isNotBlank(perforManceIds)){
-            for(String id:perforManceIds.split(",")){
-                KylinPerformanceVo kylinPerformanceVo=smileMongoUtils.getPerFormance(id);
-                if(null!=kylinPerformanceVo){
+        String perforManceIds = smileRedisUtils.getSmileShow();
+        if (StringUtils.isNotBlank(perforManceIds)) {
+            for (String id : perforManceIds.split(",")) {
+                KylinPerformanceVo kylinPerformanceVo = smileMongoUtils.getPerFormance(id);
+                if (null != kylinPerformanceVo && LocalDateTime.now().isBefore(LocalDateTime.parse(kylinPerformanceVo.getTimeEnd(), DTF_YMD_HMS))) {//演出结束不显示在列表
                     list.add(kylinPerformanceVo);
                 }
             }
@@ -121,31 +125,31 @@ public class SmileFrontServiceImpl implements SmileFrontService {
     }
 
     @Override
-    public boolean auth(String uid,SmileUserVO redisVo) {
+    public boolean auth(String uid, SmileUserVO redisVo) {
         insertUser(redisVo);
         return true;
     }
 
     @Override
     public SmileSellDataDetailVO getSellDataDetail(String agentId, String ticketId, String activeName, String ticketName) {
-        SmileSellDataDetailVO smileSellDataDetailVO = mongoTemplate.findOne(Query.query(Criteria.where("dataId").is(agentId+ticketId)),
+        SmileSellDataDetailVO smileSellDataDetailVO = mongoTemplate.findOne(Query.query(Criteria.where("dataId").is(agentId + ticketId)),
                 SmileSellDataDetailVO.class, SmileSellDataDetailVO.class.getSimpleName());
         //把手机变为  ***
         // 计算票的总量
-        List<Map> list= smileSellDataDetailVO.getList();
-        int number=0;
-        for(Map a:list){
-            String mobile=a.get("mobile")==null?"":a.get("mobile").toString();
-            if(StringUtils.isNotBlank(mobile)){
-                mobile=mobile.substring(0, 3) + "****" + mobile.substring(7, mobile.length());
-                a.replace("mobile",mobile);
+        List<Map> list = smileSellDataDetailVO.getList();
+        int number = 0;
+        for (Map a : list) {
+            String mobile = a.get("mobile") == null ? "" : a.get("mobile").toString();
+            if (StringUtils.isNotBlank(mobile)) {
+                mobile = mobile.substring(0, 3) + "****" + mobile.substring(7, mobile.length());
+                a.replace("mobile", mobile);
             }
-            int d= a.get("number")==null?0:Integer.parseInt(a.get("number").toString());
-            number=number + d;
-            if(null!=a.get("createTime")){
+            int d = a.get("number") == null ? 0 : Integer.parseInt(a.get("number").toString());
+            number = number + d;
+            if (null != a.get("createTime")) {
                 String strDateFormat = "yyyy-MM-dd HH:mm:ss";
                 SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat);
-                a.replace("createTime",sdf.format(a.get("createTime")));
+                a.replace("createTime", sdf.format(a.get("createTime")));
             }
 
         }
@@ -156,8 +160,8 @@ public class SmileFrontServiceImpl implements SmileFrontService {
     }
 
 
-    public void setUser(SmileUserVO smileUserVO,SmileUserVO redisVo,String type){
-        if(type.equals("1")){
+    public void setUser(SmileUserVO smileUserVO, SmileUserVO redisVo, String type) {
+        if (type.equals("1")) {
             redisVo.setImg(smileUserVO.getImg());
             redisVo.setSex(smileUserVO.getSex());
             redisVo.setProvinceId(smileUserVO.getProvinceId());
@@ -179,15 +183,15 @@ public class SmileFrontServiceImpl implements SmileFrontService {
             redisVo.setPhone(smileUserVO.getPhone());
             redisVo.setBirthday(smileUserVO.getBirthday());
             redisVo.setNameOneStep(smileUserVO.getNameOneStep());
-          //  redisVo.setType(smileUserVO.getType());
-        }else if (type.equals("2")){
+            //  redisVo.setType(smileUserVO.getType());
+        } else if (type.equals("2")) {
             redisVo.setName(smileUserVO.getName());
             redisVo.setIdCard(smileUserVO.getIdCard());
             redisVo.setUpdatedDate(LocalDateTime.now());
             redisVo.setUid(smileUserVO.getUid());
             redisVo.setDelTag(0);
             //redisVo.setType(smileUserVO.getType());
-        }else if(type.equals("3")){
+        } else if (type.equals("3")) {
             redisVo.setIntroduce(smileUserVO.getIntroduce());
             redisVo.setSpecialty1(smileUserVO.getSpecialty1());
             redisVo.setSpecialty2(smileUserVO.getSpecialty2());