Merge branch 'dev' into test

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

@@ -27,6 +27,8 @@ public class OrderUtils {
     private DataUtils dataUtils;
     @Value("${liquidnet.adam.url}")
     private String adamUrl;
+    @Autowired
+    private RedisUtil redisUtil;
 
     public String judgeOrderLimit(
             int type,
@@ -117,23 +119,30 @@ public class OrderUtils {
     }
 
     public boolean isMember(String uid) {
-        String resultData = HttpUtil.get("/adam/member/check/depth?uid=" + uid, null);
-        AdamUserMemberVo vo = JsonUtils.fromJson(resultData, AdamUserMemberVo.class);
+//        String resultData = HttpUtil.get("/adam/member/check/depth?uid=" + uid, null);
+//        AdamUserMemberVo vo = JsonUtils.fromJson(resultData, AdamUserMemberVo.class);
+
+        String rk = AdamRedisConst.INFO_USER_MEMBER.concat(uid);
+        AdamUserMemberVo vo = (AdamUserMemberVo) redisUtil.get(rk);
         return null != vo && vo.isActive();
     }
 
 
     public AdamAddressesVo getAddress(String uid, String addressesId) {
-        String resultData = HttpUtil.get("/adam/member/check/depth?uid=" + uid, null);
-        List<AdamAddressesVo> vos = JsonUtils.fromJson(resultData, new TypeReference<List<AdamAddressesVo>>() {
-        });
+//        String resultData = HttpUtil.get("/adam/addr/query/depth?uid=" + uid + "&addrId=" + addressesId, null);
+//        List<AdamAddressesVo> vos = JsonUtils.fromJson(resultData, new TypeReference<List<AdamAddressesVo>>() {
+//        });
+        String rk = AdamRedisConst.INFO_ADDRESSES.concat(uid);
+        List<AdamAddressesVo> vos = (List<AdamAddressesVo>) redisUtil.get(rk);
         return vos.stream().filter(r -> r.getAddressesId().equals(addressesId)).findAny().orElse(null);
     }
 
     public AdamEntersVo getEnters(String uid, String entersId) {
-        String resultData = HttpUtil.get("/adam/member/check/depth?uid=" + uid, null);
-        List<AdamEntersVo> vos = JsonUtils.fromJson(resultData, new TypeReference<List<AdamEntersVo>>() {
-        });
+//        String resultData = HttpUtil.get("/adam/enters/query/depth?uid=" + uid + "&entersId=" + entersId, null);
+//        List<AdamEntersVo> vos = JsonUtils.fromJson(resultData, new TypeReference<List<AdamEntersVo>>() {
+//        });
+        String rk = AdamRedisConst.INFO_ENTERS.concat(uid);
+        List<AdamEntersVo> vos = (List<AdamEntersVo>) redisUtil.get(rk);
         return vos.stream().filter(r -> r.getEntersId().equals(entersId)).findAny().orElse(null);
     }
 

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

@@ -458,8 +458,8 @@ public class DataImpl {
     public boolean order(String month) {
 
         String driverClassName = "com.mysql.cj.jdbc.Driver";    //启动驱动
-        String url = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/mall";    //设置连接路径
-//        String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/mall";
+//        String url = "jdbc:mysql://pc-2ze6z2hxkug559q79.mysql.polardb.rds.aliyuncs.com:3306/mall";    //设置连接路径
+        String url = "jdbc:mysql://zhengzai.mysql.polardb.rds.aliyuncs.com:3306/mall";
         String username = "readonly";    //数据库用户名
         String password = "ZWDsf8Fy";    //数据库连接密码
         Connection con = null;        //连接
@@ -503,7 +503,6 @@ public class DataImpl {
                     KylinOrderTickets orderTickets = new KylinOrderTickets();
                     KylinOrderTicketStatus orderTicketStatus = new KylinOrderTicketStatus();
                     KylinOrderTicketRelations orderTicketRelations = new KylinOrderTicketRelations();
-                    KylinOrderTicketEntities orderTicketEntities = new KylinOrderTicketEntities();
                     KylinOrderTicketVo orderTicketVo = new KylinOrderTicketVo();
 
                     ArrayList<KylinOrderTicketEntitiesVo> entitiesVosList = new ArrayList<>();
@@ -678,8 +677,9 @@ public class DataImpl {
                     pstmt = con.prepareStatement(enterSql);
                     ResultSet enterData = pstmt.executeQuery();
                     while (enterData.next()) {
-
                         KylinOrderTicketEntitiesVo entitiesVo = new KylinOrderTicketEntitiesVo();
+                        KylinOrderTicketEntities orderTicketEntities = new KylinOrderTicketEntities();
+
                         orderTicketEntities.setOrderTicketEntitiesId(enterData.getInt("id") + "");
                         orderTicketEntities.setOrderId(orderTickets.getOrderTicketsId());
                         orderTicketEntities.setTicketId(enterData.getInt("ticket_id") + "");