脚本 消费 和 订单回调 修改

liquidnet-bus-common/liquidnet-common-service-base/src/main/java/com/liquidnet/service/base/SqlMapping.java

@@ -6,8 +6,11 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Serializable;
+import java.lang.reflect.Array;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.Properties;
 
 public class SqlMapping {
@@ -35,6 +38,7 @@ public class SqlMapping {
         private static final long serialVersionUID = 2208924091512163151L;
         private LinkedList<String> sqls;
         private LinkedList<Object[]>[] args;
+        private String redisKey;
 
         private SqlMessage() {
         }
@@ -61,6 +65,14 @@ public class SqlMapping {
             this.args = args;
         }
 
+        public String getRedisKey() {
+            return redisKey;
+        }
+
+        public void setRedisKey(String redisKey) {
+            this.redisKey = redisKey;
+        }
+
         private final static SqlMapping.SqlMessage instance = new SqlMapping.SqlMessage();
 
         public static SqlMapping.SqlMessage getInstance() {
@@ -106,4 +118,10 @@ public class SqlMapping {
         sqlMessage.setArgs(paramsList);
         return JsonUtils.toJson(sqlMessage);
     }
+
+    public static String getSqlRedis(String redisKey) {
+        SqlMapping.SqlMessage sqlMessage = SqlMapping.SqlMessage.getInstance();
+        sqlMessage.setRedisKey(redisKey);
+        return JsonUtils.toJson(sqlMessage);
+    }
 }

liquidnet-bus-service/liquidnet-service-consumer/pom.xml

@@ -31,6 +31,11 @@
             <artifactId>liquidnet-common-cache-redisson</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-cache-redis</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>

liquidnet-bus-service/liquidnet-service-consumer/src/main/java/com/liquidnet/service/consumer/service/IBaseDao.java

@@ -21,6 +21,14 @@ public interface IBaseDao {
      */
     Boolean batchSqls(LinkedList<String> sql, LinkedList<Object[]>... values);
 
+    /**
+     * 执行sql语句 无 参数
+     *
+     * @param sql
+     * @return
+     */
+    Boolean batchSqlNoArgs(LinkedList<String> sql);
+
     /**
      * xs 新增一条记录且返回主键Id
      *

liquidnet-bus-service/liquidnet-service-consumer/src/main/java/com/liquidnet/service/consumer/service/impl/BaseDao.java

@@ -82,6 +82,26 @@ public class BaseDao implements IBaseDao {
         }
     }
 
+    @Override
+    public Boolean batchSqlNoArgs(final LinkedList<String> sql) {
+        try {
+            TransactionCallback<Boolean> callback = new TransactionCallback<Boolean>() {
+                @Override
+                public Boolean doInTransaction(final TransactionStatus transactionStatus) {
+                    for (String o : sql) {
+                        jdbcTemplate.execute(o);
+                    }
+                    return true;
+                }
+            };
+
+            TransactionTemplate tt = new TransactionTemplate(transactionManager);
+            return tt.execute(callback);
+        } catch (Exception ex) {
+            log.error("###Error.Sqls:{}\nParameters:{},Ex:{}", sql);
+            return false;
+        }
+    }
 
     /**
      * xs 新增一条记录且返回主键Id

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

@@ -156,7 +156,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 //redisLockUtil.unlock(lock);
                 return ResponseDto.failure(ErrorMapping.get("20004"));//参数错误
             }
-            if (payOrderParam.getNumber()%ticketData.getCounts()!=0) {
+            if (payOrderParam.getNumber() % ticketData.getCounts() != 0) {
                 //redisLockUtil.unlock(lock);
                 return ResponseDto.failure(ErrorMapping.get("20007"));//数量错误
             }
@@ -1083,20 +1083,23 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 }
                 currentTime = System.currentTimeMillis() - currentTime;
                 log.debug("redis 库存 -> time:" + (currentTime) + "毫秒");
+
                 //mysql
-                    LinkedList<String> sqls = new LinkedList<>();
                 String orderStr = "";
-                    log.debug("orderIdList -> size() :" + orderIdList.size());
                 for (int i = 0; i < orderIdList.size(); i++) {
                     String orderTicketId = orderIdList.get(i).split(",")[0];
-                        orderStr += "'"+orderTicketId + "',";
+                    orderStr += "'" + orderTicketId + "',";
                 }
-                    log.debug("orderStr -> STR :" + orderStr.toString());
+
                 orderStr = orderStr.substring(0, orderStr.length() - 1);
+                LinkedList<String> sqls = new LinkedList();
                 sqls.add("UPDATE kylin_order_tickets SET updated_at = '" + now + "' WHERE  order_tickets_id in (" + orderStr + ") ");
                 sqls.add("UPDATE kylin_order_ticket_status SET `status` = 2,updated_at = '" + now + "' WHERE order_id in (" + orderStr + ") ");
                 sqls.add("UPDATE kylin_order_ticket_relations SET updated_at = '" + now + "' WHERE  order_id in (" + orderStr + ")");
-                    rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE, MQConst.ROUTING_KEY_SQL_ORDER_CLOSE, SqlMapping.gets(sqls));
+                String redisKey = "kylin:ORDER_CLOSE:" + IDGenerator.nextMilliId();
+                redisUtil.set(redisKey, sqls);
+                rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE, MQConst.ROUTING_KEY_SQL_ORDER_CLOSE, sqls);
+
                 currentTime = System.currentTimeMillis() - currentTime;
                 log.debug("mysql -> time:" + (currentTime) + "毫秒");