Merge remote-tracking branch 'origin/dev' into dev

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

@@ -546,8 +546,8 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderServ
         currentTime = System.currentTimeMillis();
         String returnData = HttpUtil.post(payUrl, httpData);
         currentTime = System.currentTimeMillis() - currentTime;
-        log.debug("调用 DRAGON 支付 -> time:" + (currentTime) + "毫秒");
-        log.debug("调用 DRAGON 结果 = " + returnData);
+        log.info("调用 DRAGON 支付 -> time:" + (currentTime) + "毫秒");
+        log.info("调用 DRAGON 结果 = " + returnData);
         PayResultVo payResultVo = JsonUtils.fromJson(returnData, PayResultVo.class);
         payResultVo.getData().setOrderId(orderTicketId);
         payResultVo.getData().setPrice(orderTickets.getPriceActual());

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

@@ -104,7 +104,7 @@ public class DataImpl {
             KylinTicketTimesPartnerVo ticketTimesPartnerVo = new KylinTicketTimesPartnerVo();
             KylinTicketPartnerVo ticketPartnerVo = new KylinTicketPartnerVo();
 
-            int count = 200;
+            int count = 2000;
             int page = 0;
 
             try {

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

@@ -66,24 +66,41 @@ public class SweetAppletController {
             @ApiImplicitParam(type = "query", dataType = "String", name = "dateTime", value = "时间 全部传 \"\"", required = true),
             @ApiImplicitParam(type = "query", dataType = "String", name = "stage", value = "舞台 全部传 \"\"", required = true),
             @ApiImplicitParam(type = "query", dataType = "Integer", name = "isSign", value = "是否签名(1是0否)", required = true),
-            @ApiImplicitParam(type = "query", dataType = "Integer", name = "page", value = "页数", required = true),
-            @ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = true),
+            @ApiImplicitParam(type = "query", dataType = "Integer", name = "page", value = "页数", required = false),
+            @ApiImplicitParam(type = "query", dataType = "Integer", name = "size", value = "数量", required = false),
+            @ApiImplicitParam(type = "query", dataType = "String", name = "uid", value = "用户id", required = true),
     })
-    public ResponseDto<SweetManualArtistList2Dto> timeList(@RequestParam() String manualId,
-                                                           @RequestParam() String dateTime,
-                                                           @RequestParam() String stage,
-                                                           @RequestParam() Integer isSign,
-                                                           @RequestParam() Integer page,
-                                                           @RequestParam() Integer size) {
-        String uid = CurrentUtil.getCurrentUid();
-        int startPosition = (page - 1) * size;
-        int endPosition = (page) * size;
+    public ResponseDto<SweetManualArtistList2Dto> timeList(@RequestParam String manualId,
+                                                           @RequestParam String dateTime,
+                                                           @RequestParam String stage,
+                                                           @RequestParam Integer isSign,
+                                                           @RequestParam Integer page,
+                                                           @RequestParam Integer size,
+                                                           @RequestParam String uid) {
+
+        List<SweetManualArtistListDto> allReturnArtist = new ArrayList();
+        List<SweetManualArtistListDto> returnArtist = new ArrayList();
+
         SweetManualArtistList2Dto data = redisDataUtils.getTimeList(manualId);
         SweetArtistsRelationVo relationData = redisDataUtils.getArtistsRelationRedisVo(uid);
 
         List<SweetManualArtistListDto> artistData = data.getData();
-        List<SweetManualArtistListDto> allReturnArtist = new ArrayList();
-        List<SweetManualArtistListDto> returnArtist = new ArrayList();
+
+        int startPosition = 0;
+        int endPosition = 0;
+        if (page != null) {
+            startPosition = (page - 1) * size;
+            endPosition = (page) * size;
+        }
+
+        if (page != null && dateTime.equals("")) {
+            try {
+                dateTime = data.getDate().get(0);
+            } catch (Exception e) {
+
+            }
+        }
+
         for (SweetManualArtistListDto item : artistData) {
             boolean isSave = false;
             if (isSign == 1) {
@@ -114,7 +131,7 @@ public class SweetAppletController {
 
         for (int i = 0; i < allReturnArtist.size(); i++) {
             SweetManualArtistListDto item = allReturnArtist.get(i);
-            if (i >= startPosition && i < endPosition) {
+            if (page != null && i >= startPosition && i < endPosition) {
 
                 item.setIsWatch(0);
                 item.setIsSign(0);
@@ -157,10 +174,13 @@ public class SweetAppletController {
     @ApiOperation("艺人-想看")
     @ApiImplicitParams({
             @ApiImplicitParam(type = "query", dataType = "String", name = "uid", value = "用户id", required = true),
-            @ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人id", required = true)
+            @ApiImplicitParam(type = "query", dataType = "String", name = "artistsId", value = "艺人id", required = true),
     })
     public ResponseDto<Boolean> watch(@RequestParam() String uid,
                                       @RequestParam() String artistsId) {
+        if (uid.equalsIgnoreCase("0")) {
+            return ResponseDto.failure();
+        }
         redisDataUtils.setArtistsRelationRedisVo(uid, artistsId, "sign");
         return ResponseDto.success();
     }
@@ -173,6 +193,9 @@ public class SweetAppletController {
     })
     public ResponseDto<Boolean> sign(@RequestParam() String uid,
                                      @RequestParam() String artistsId) {
+        if (uid.equalsIgnoreCase("0")) {
+            return ResponseDto.failure();
+        }
         redisDataUtils.setArtistsRelationRedisVo(uid, artistsId, "watch");
         return ResponseDto.success();
     }
@@ -192,13 +215,13 @@ public class SweetAppletController {
         SweetManualShopAllVo vo = SweetManualShopAllVo.getNew();
 
         for (SweetManualShop item : shopList) {
-            if(item.getIsRecommend().equals(1)){
+            if (item.getIsRecommend().equals(1)) {
                 recommend.add(item);
             }
-            if(item.getType().equals(1)){
+            if (item.getType().equals(1)) {
                 eat.add(item);
             }
-            if(item.getType().equals(2)){
+            if (item.getType().equals(2)) {
                 play.add(item);
             }
         }