Merge branch 'master' into dev_change_times

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinBannersController.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -26,6 +27,7 @@ import java.util.List;
 @Api(tags = "前端-banner")
 @RestController
 @RequestMapping("banners")
+@Slf4j
 public class KylinBannersController {
 
     @Autowired
@@ -45,6 +47,7 @@ public class KylinBannersController {
             List<KylinBanners> result = bannersServiceImpl.blist(position, provinceName);
             return ResponseDto.success(result);
         } catch (Exception e) {
+            log.error("banner列表Error", e);
             return ResponseDto.success(new ArrayList<>());
         }
     }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/KylinPerformancesController.java

 package com.liquidnet.service.kylin.controller;
 
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.liquidnet.commons.lang.util.CollectionUtil;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
@@ -11,9 +13,12 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.juli.logging.Log;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -28,6 +33,7 @@ import java.util.List;
 @Api(tags = "前端-演出")
 @RestController
 @RequestMapping("performance")
+@Slf4j
 public class KylinPerformancesController {
 
     @Autowired
@@ -115,8 +121,12 @@ public class KylinPerformancesController {
             @ApiImplicitParam(type = "query", dataType = "String", name = "cityName", value = "城市名称", required = true)
     })
     public ResponseDto<List> performanceCalendar(@RequestParam String yearMonth, @RequestParam String cityName) {
-        List result = null;
-        result = kylinPerformancesService.performanceCalendar(yearMonth, cityName);
+        List result = CollectionUtil.arrayListString();
+        try {
+            result = kylinPerformancesService.performanceCalendar(yearMonth, cityName);
+        } catch (Exception e) {
+            log.error("kylinCalendarError", e);
+        }
         return ResponseDto.success(result);
     }
 
@@ -154,10 +164,15 @@ public class KylinPerformancesController {
             @RequestParam(defaultValue = "0") double longitudeFrom,
             @RequestParam(defaultValue = "0") String agentId
     ) {
-        KylinPerformanceVo result = kylinPerformancesService.detail(performancesId, latitudeFrom, longitudeFrom, agentId);
-        if (result != null) {
-            return ResponseDto.success(result);
-        } else {
+        try {
+            KylinPerformanceVo result = kylinPerformancesService.detail(performancesId, latitudeFrom, longitudeFrom, agentId);
+            if (result != null) {
+                return ResponseDto.success(result);
+            } else {
+                return ResponseDto.failure(ErrorMapping.get("20700"));
+            }
+        } catch (Exception e) {
+            log.error("演出详情Error", e);
             return ResponseDto.failure(ErrorMapping.get("20700"));
         }
     }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -245,7 +245,13 @@ public class KylinPerformancesServiceImpl implements IKylinPerformancesService {
         List<KylinPerformanceVo> performancesList = dataUtils.getPerformancesListOfcityName(cityName);
 
         // 获取此月开始结束时间
-        String monthStart = DateUtil.getMonthFirst(yearMonth);
+        String[] split = yearMonth.split("-");
+        String monthStart = "";
+        if (split.length > 2) {
+            monthStart = DateUtil.getMonthFirst(split[0].concat("-").concat(split[1]));
+        } else {
+            monthStart = DateUtil.getMonthFirst(yearMonth);
+        }
         String monthEnd = "";
         monthEnd = DateUtil.getMonthLast(monthStart);
 

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

@@ -15,6 +15,7 @@ public class SweetConstant {
     public final static String REDIS_KEY_SWEET_SHOP = "sweet:artists:shop:manual:";
 
     public final static String REDIS_KEY_SWEET_LUCK_DRAW = "sweet:luckDraw:mobile:";
+    public final static String REDIS_KEY_SWEET_LUCK_DRAW_RESULT = "sweet:luckDraw:num:";
     public final static String REDIS_KEY_SWEET_LUCK_DRAW_SURPLUS = "sweet:luckDraw:num:";//中奖库存
     public final static String REDIS_KEY_SWEET_LUCK_DRAW_ALL = "sweet:luckDraw:num:";//中奖总量
     public final static String REDIS_KEY_SWEET_LUCK_DRAW_PRESENT_MOBILE = "sweet:luckDraw:present:mobile:";//中奖库存

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

@@ -336,6 +336,7 @@ public class SweetAppletController {
 
         HashMap<String, Integer> hashMap = CollectionUtil.mapStringInteger();
         hashMap.put("count", redisDataUtils.getLuckDrawStatus(mobile, luckDrawNum));
+        hashMap.put("prize", redisDataUtils.getLuckDrawResult(mobile, luckDrawNum));
         return ResponseDto.success(hashMap);
     }
 

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

@@ -6,6 +6,7 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -19,6 +20,7 @@ import java.io.*;
 @Api(tags = "同步微信用户数据")
 @RestController
 @RequestMapping("/wechatSync")
+@Slf4j
 public class SweetWechatSyncDataController {
 
     @Autowired
@@ -35,18 +37,17 @@ public class SweetWechatSyncDataController {
             BufferedReader bufferedReader = new BufferedReader(read);
             String mobile = null;
             while ((mobile = bufferedReader.readLine()) != null) {
-                System.out.println(mobile);
-
+                log.info("mobile：[{}]", mobile);
                 try {
                     MultiValueMap<String, String> params = new LinkedMultiValueMap();
                     params.add("mobile", mobile);
 
 //                    String url = "http://127.0.0.1:9001/adam/rsc/reg/mobile";
-//                    String url = "http://testadam.zhengzai.tv/adam/rsc/reg/mobile";
+//                    String url = "http://adam.zhengzai.tv/adam/rsc/reg/mobile";
                     String url = "";
                     HttpUtil.post(url, params);
                 } catch (Exception e) {
-                    e.printStackTrace();
+                    log.info("regMobileException：mobile：[{}]", mobile);
                 }
 
             }
@@ -62,7 +63,7 @@ public class SweetWechatSyncDataController {
         try {
             sweetWechatMpService.userInfo();
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("getUsers", e);
         }
     }
 
@@ -75,7 +76,7 @@ public class SweetWechatSyncDataController {
         try {
             sweetWechatMpService.getUser(openId);
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error("getUser", e);
         }
     }
 

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

@@ -46,16 +46,11 @@ public class SweetWechatTemplateController {
     public ResponseDto followStatus(
             @RequestParam() String unionId
     ) {
-        boolean status = sweetTemplateService.followStatusStr(unionId);
+        boolean status = sweetTemplateService.followStatus(unionId);
         if (status) {
             return ResponseDto.success(1);
         } else {
-            status = sweetTemplateService.followStatus(unionId);
-            if (status) {
-                return ResponseDto.success(1);
-            } else {
-                return ResponseDto.success(2);
-            }
+            return ResponseDto.success(2);
         }
     }
 

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

@@ -47,42 +47,49 @@ public class SweetWechatMpService {
             log.info("nextOpenid：[{}] ", nextOpenid);
 
             for (String openId : openids) {
-                WxMpUser wxMpUser = wxMpService.getUserService().userInfo(openId);
-                log.info("openId：[{}],wxMpUsers：[{}]", openId, wxMpUser);
-
-                SweetWechatUser userInfo = redisDataUtils.getSweetWechatUser(wxMpUser.getUnionId());
-                if (null == userInfo) {
-                    SweetWechatUser sweetWechatUser = SweetWechatUser.getNew();
-                    sweetWechatUser.setOpenId(wxMpUser.getOpenId());
-                    sweetWechatUser.setUnionId(wxMpUser.getUnionId());
-                    sweetWechatUser.setNickname(wxMpUser.getNickname());
-                    sweetWechatUser.setSexDesc(wxMpUser.getSexDesc());
-                    sweetWechatUser.setSex(wxMpUser.getSex());
-                    sweetWechatUser.setHeadImgUrl(wxMpUser.getHeadImgUrl());
-                    sweetWechatUser.setLanguage(wxMpUser.getLanguage());
-                    sweetWechatUser.setCountry(wxMpUser.getCountry());
-                    sweetWechatUser.setProvince(wxMpUser.getProvince());
-                    sweetWechatUser.setCity(wxMpUser.getCity());
-                    sweetWechatUser.setSubscribeTime(DateUtil.ofEpochMilli(wxMpUser.getSubscribeTime()));
-                    sweetWechatUser.setSubscribeScene(wxMpUser.getSubscribeScene());
-                    sweetWechatUser.setUserId(IDGenerator.nextSnowId());
-                    LinkedList<String> sqls = CollectionUtil.linkedListString();
-                    LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
-                    sqls.add(SqlMapping.get("sweet_user.insert"));
-                    sqlsDataA.add(new Object[]{
-                            sweetWechatUser.getUserId(), sweetWechatUser.getOpenId(), sweetWechatUser.getUnionId(), sweetWechatUser.getNickname(),
-                            sweetWechatUser.getSexDesc(), sweetWechatUser.getSex(), sweetWechatUser.getHeadImgUrl(), sweetWechatUser.getLanguage(),
-                            sweetWechatUser.getCountry(), sweetWechatUser.getProvince(), sweetWechatUser.getCity(),
-                            sweetWechatUser.getSubscribeTime(), sweetWechatUser.getSubscribeScene()
-                    });
-                    queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_USER_INSERT_DRAW.getKey(),
-                            SqlMapping.gets(sqls, sqlsDataA));
-                    // 入缓存
-                    redisDataUtils.setSweetWechatUser(sweetWechatUser);
+                try {
+                    WxMpUser wxMpUser = wxMpService.getUserService().userInfo(openId);
+                    if (!wxMpUser.getSubscribe()) {
+                        log.info("getSubscribeFalse：openId：[{}]", openId);
+                        continue;
+                    }
+                    SweetWechatUser userInfo = redisDataUtils.getSweetWechatUser(wxMpUser.getUnionId());
+                    if (null == userInfo) {
+                        SweetWechatUser sweetWechatUser = SweetWechatUser.getNew();
+                        sweetWechatUser.setOpenId(wxMpUser.getOpenId());
+                        sweetWechatUser.setUnionId(wxMpUser.getUnionId());
+                        sweetWechatUser.setNickname(wxMpUser.getNickname());
+                        sweetWechatUser.setSexDesc(wxMpUser.getSexDesc());
+                        sweetWechatUser.setSex(wxMpUser.getSex());
+                        sweetWechatUser.setHeadImgUrl(wxMpUser.getHeadImgUrl());
+                        sweetWechatUser.setLanguage(wxMpUser.getLanguage());
+                        sweetWechatUser.setCountry(wxMpUser.getCountry());
+                        sweetWechatUser.setProvince(wxMpUser.getProvince());
+                        sweetWechatUser.setCity(wxMpUser.getCity());
+                        sweetWechatUser.setSubscribeTime(DateUtil.ofEpochMilli(wxMpUser.getSubscribeTime()));
+                        sweetWechatUser.setSubscribeScene(wxMpUser.getSubscribeScene());
+                        sweetWechatUser.setUserId(IDGenerator.nextSnowId());
+                        LinkedList<String> sqls = CollectionUtil.linkedListString();
+                        LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
+                        sqls.add(SqlMapping.get("sweet_user.insert"));
+                        sqlsDataA.add(new Object[]{
+                                sweetWechatUser.getUserId(), sweetWechatUser.getOpenId(), sweetWechatUser.getUnionId(), sweetWechatUser.getNickname(),
+                                sweetWechatUser.getSexDesc(), sweetWechatUser.getSex(), sweetWechatUser.getHeadImgUrl(), sweetWechatUser.getLanguage(),
+                                sweetWechatUser.getCountry(), sweetWechatUser.getProvince(), sweetWechatUser.getCity(),
+                                sweetWechatUser.getSubscribeTime(), sweetWechatUser.getSubscribeScene()
+                        });
+                        queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_USER_INSERT_DRAW.getKey(),
+                                SqlMapping.gets(sqls, sqlsDataA));
+                        // 入缓存
+                        redisDataUtils.setSweetWechatUser(sweetWechatUser);
+                    }
+                } catch (Exception e) {
+                    log.info("forException：openId：[{}]", openId);
                 }
             }
-
+            log.info("nextOpenidSuccess：[{}] ", nextOpenid);
         } while (!nextOpenid.isEmpty());
+        log.info("同步微信用户完成");
     }
 
     public void getUser(String openId) throws WxErrorException {

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

@@ -404,6 +404,17 @@ public class RedisDataUtils {
         }
     }
 
+    //获取抽奖状态
+    public int getLuckDrawResult(String mobile, String luckDrawNum) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_LUCK_DRAW_RESULT.concat(luckDrawNum).concat(":mobile:" + mobile);
+        Object obj = redisUtil.get(redisKey);
+        if(obj==null){
+            return 0;
+        }else{
+            return (int) redisUtil.get(redisKey);
+        }
+    }
+
     //修改抽奖状态
     public SweetPrizeVo changeLuckDrawStatus(String mobile, String unionId,String luckDrawNum) {
         LinkedList<String> sqls = CollectionUtil.linkedListString();
@@ -444,6 +455,7 @@ public class RedisDataUtils {
                 if (surplus < prizeALl) {
                     prize = (int) redisUtil.incr(redisSurplus, 1);
                     redisUtil.set(redisKey, 2);
+                    redisUtil.set(SweetConstant.REDIS_KEY_SWEET_LUCK_DRAW_RESULT.concat(luckDrawNum).concat(":mobile:" + mobile),prize);
                 }
             }
         }