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

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinOrderTickets.java

@@ -206,7 +206,7 @@ public class KylinOrderTickets implements Serializable, Cloneable {
     /**
      * ip地址
      */
-    private Integer ipAddress;
+    private String ipAddress;
 
     /**
      * comment

liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/chime/utils/DoTaskUtils.java

@@ -46,18 +46,14 @@ public class DoTaskUtils {
         if (taskObj == null){
             //满足10次调用接口，每天最多调用一次
             if (slidCount >= 10) {
+                try {
                     MultiValueMap<String, String> params = CollectionUtil.linkedMultiValueMapStringString();
                     params.add("uid", currentUserId);
                     params.add("taskId", 3 + "");
                     String resultData = HttpUtil.post(stoneUrl + "/user/inner/doTask", params);
-                ChimeUserDoTask chimeUserDoTask = JsonUtils.fromJson(resultData, ChimeUserDoTask.class);
-                Boolean success = chimeUserDoTask.getSuccess();
-                //接口调用失败，重试
-                if (!success) {
-                    this.userAddNum(currentUserId);
-                } else {
-                    //调用接口成功,记录
                     redisUtil.set(ChimeConstant.REDIS_USER_TO_DOTASK + currentUserId, 1, timeout);
+                }catch (Exception e){
+                    log.error("任务接口调用失败currentUserId:"+currentUserId,e);
                 }
             }
         }

liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/java/com/liquidnet/service/stone/service/impl/StoneScoreLogsServiceImpl.java

@@ -314,11 +314,11 @@ public class StoneScoreLogsServiceImpl implements IStoneScoreLogsService {
      */
     private LocalDateTime getOverdueAt() {
         LocalDateTime now = LocalDateTime.now();
-        LocalDateTime overdueAt = LocalDateTime.of(now.getHour(), 10, 27, 0, 0, 0);
+        LocalDateTime overdueAt = LocalDateTime.of(now.getYear(), 10, 27, 0, 0, 0);
         if (now.isAfter(overdueAt)) {
-            overdueAt = LocalDateTime.of(now.getHour() + 1, 12, 27, 0, 0, 0);
+            overdueAt = LocalDateTime.of(now.getYear() + 1, 12, 27, 0, 0, 0);
         } else {
-            overdueAt = LocalDateTime.of(now.getHour(), 12, 27, 0, 0, 0);
+            overdueAt = LocalDateTime.of(now.getYear(), 12, 27, 0, 0, 0);
         }
         return overdueAt;
     }