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

liquidnet-bus-api/liquidnet-service-adam-api/src/main/java/com/liquidnet/service/adam/service/IAdamUserService.java

@@ -17,13 +17,7 @@ import java.util.List;
  * @author liquidnet
  * @since 2021-05-10
  */
-public interface IAdamUserService extends IService<AdamUser> {
-
-//    String queryUidByRedis(String mobile);
-//
-//    String queryUidByRedis(String openId, String platform);
-
-//    AdamUserInfoVo queryByUid(String uid);
+public interface IAdamUserService {
 
     /**
      * 手机号注册

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderTicketEntitiesVo.java

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.dto.vo.mongo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 @Data
 public class KylinOrderTicketEntitiesVo implements Serializable, Cloneable {
@@ -39,6 +40,7 @@ public class KylinOrderTicketEntitiesVo implements Serializable, Cloneable {
     private String checkedAt;
     private String checkUserId;
 
+    private LocalDateTime changeDate;
 
     private static final KylinOrderTicketEntitiesVo obj = new KylinOrderTicketEntitiesVo();
 

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderTicketVo.java

@@ -10,6 +10,7 @@ import org.springframework.beans.BeanUtils;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @ApiModel(value = "KylinOrderTicketVo", description = "订单数据")
@@ -98,6 +99,13 @@ public class KylinOrderTicketVo implements Serializable {
     private String createdAt;
     private String updatedAt;
 
+    private LocalDateTime changeDate;
+
+    private Integer isTrueName;
+    private String noticeImage;
+    private Integer ticketType;
+    private String fieldName;
+
     private List<KylinOrderTicketEntitiesVo> entitiesVoList;
 
     public void setOrderTicket(KylinOrderTickets orderTicket) {

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/returns/OrderDetailsVo.java

@@ -11,8 +11,6 @@ import java.util.List;
 @Data
 public class OrderDetailsVo {
     private KylinOrderTicketVo orderTicketVo;
-    private List<KylinOrderTicketEntitiesVo> orderTicketEntitiesVo;
-    private KylinPerformanceVo performanceVo;
     private String express_number;
     private String express_company;
     private Integer kuaidi_status;

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/DateUtil.java

@@ -36,6 +36,7 @@ public abstract class DateUtil {
         yyyyMMddHHmm("yyyy-MM-dd HH:mm"),
         yyyyMMddHHmmss("yyyy-MM-dd HH:mm:ss"),
         yyyyMMddHHmmssTrim("yyyyMMddHHmmss"),
+        yyyyMMddHHmmssSSS("yyyyMMddHHmmssSSS"),
         ddHHmmssTrim("ddHHmmss"),
         yyyy_MM_dd_zh("yyyy年MM月dd日"),
         MM_dd_zh("MM月dd日"),

liquidnet-bus-common/liquidnet-common-base/src/main/java/com/liquidnet/commons/lang/util/HttpUtil.java

@@ -5,6 +5,11 @@ import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.client.RestTemplate;
 
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.util.List;
+import java.util.Map;
+
 public class HttpUtil {
 	/**
 	 * get请求
@@ -140,4 +145,29 @@ public class HttpUtil {
 		ResponseEntity<String> response = client.exchange(url, method, httpEntity, String.class);
 		return response.getBody();
 	}
+
+
+
+
+	private static final String PHP_API_KEY = "R7tXY9smPQPG9Ku5yI0u6sfnlckmk04V";
+
+	public static String postToPhpApi(String url, MultiValueMap<String, String> params) {
+		params.add("sign", processForPhpApi(params).concat("&key=").concat(PHP_API_KEY).toUpperCase());
+		return post(url, params, null);
+	}
+
+	private static String processForPhpApi(MultiValueMap<String, String> map) {
+		StringBuilder sb = new StringBuilder();
+		for (Map.Entry<String, List<String>> entry : map.entrySet()) {
+			sb.append(entry.getKey()).append("=").append(entry.getValue().get(0)).append("&");
+		}
+		String targetStr = sb.substring(0, sb.length() - 1);
+		try {
+			targetStr = URLDecoder.decode(targetStr, "UTF-8");
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
+		targetStr = targetStr.replace("%3D", "=").replace("%26", "&");
+		return targetStr;
+	}
 }

liquidnet-bus-common/liquidnet-common-exception/liquidnet-common-exception-base/src/main/java/com/liquidnet/common/exception/LiquidnetServiceException.java

@@ -15,6 +15,9 @@ public class LiquidnetServiceException extends RuntimeException {
     private String message;
     private Object data;
 
+    public LiquidnetServiceException() {
+    }
+
     public LiquidnetServiceException(String code, String message) {
         super(message);
         this.code = code;

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-dev.yml

@@ -26,6 +26,8 @@ liquidnet:
     pay: http://testpay.zhengzai.tv
     check: http://testpay.zhengzai.tv/order/verify
     callback: http://devzuul.zhengzai.tv/adam/member/order/callback
+  url-service:
+    url: http://testservice.zhengzai.tv
   aliyun:
     accessKeyId: LTAI4FvoqxJUT5T1ydJSyhUn
     accessSecret: WNCgFn9dSjnoDdej2YTvR0v0216WWU

liquidnet-bus-config/liquidnet-config/liquidnet-service-adam-test.yml

@@ -26,6 +26,8 @@ liquidnet:
     pay: http://testpay.zhengzai.tv
     check: http://testpay.zhengzai.tv/order/verify
     callback: http://zuul.zhengzai.tv/adam/member/order/callback
+  url-service:
+    url: http://testservice.zhengzai.tv
   aliyun:
     accessKeyId: LTAI4FvoqxJUT5T1ydJSyhUn
     accessSecret: WNCgFn9dSjnoDdej2YTvR0v0216WWU

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer-dev.yml

@@ -15,7 +15,7 @@ liquidnet:
     pattern-file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
     pattern-rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
-    level-root: info
+    level-root: debug
   rabbitmq:
     connection-timeout: 5000
   mysql:

liquidnet-bus-config/liquidnet-config/liquidnet-service-consumer.yml

@@ -25,7 +25,7 @@ logging:
     root: info
     #以下是为指定包设置日志级别
     com:
-      liquidnet: info
+      liquidnet: ${liquidnet.logfile.level-root}
 # -----------------------------------------------------------
 eureka:
 #  client:
@@ -63,6 +63,11 @@ spring:
     password: ${liquidnet.rabbitmq.password}
     virtual-host: ${liquidnet.rabbitmq.virtual-host}
     connection-timeout: ${liquidnet.rabbitmq.connection-timeout}
+    publisher-confirms: true
+    publisher-returns: true
+    listener:
+      simple:
+        acknowledge-mode: manual
   redis:
     database: 15
     port: ${liquidnet.redis.port}

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

@@ -129,9 +129,9 @@ public class KylinOrderTicketEntities implements Serializable {
      *
      * @return
      */
-    public Object[] getSynOrderObject() {
+    public Object[] getSynOrderObject(LocalDateTime updateTime,LocalDateTime createTime) {
         return new Object[]{
-                isPayment, updatedAt, orderId
+                isPayment, updatedAt, orderId,updateTime,createTime
         };
     }
 }

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

@@ -87,9 +87,9 @@ public class KylinOrderTicketStatus implements Serializable {
      *
      * @return
      */
-    public Object[] getSynOrderObject() {
+    public Object[] getSynOrderObject(LocalDateTime updateTime,LocalDateTime createTime) {
         return new Object[]{
-                status, payStatus, updatedAt, orderId
+                status, payStatus, updatedAt, orderId,updateTime,createTime
         };
     }
 
@@ -98,9 +98,9 @@ public class KylinOrderTicketStatus implements Serializable {
      *
      * @return
      */
-    public Object[] getCloseOrderObject() {
+    public Object[] getCloseOrderObject(LocalDateTime updateTime,LocalDateTime createTime) {
         return new Object[]{
-                status, updatedAt, orderId
+                status, updatedAt, orderId,updateTime,createTime
         };
     }
 }

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

@@ -212,9 +212,9 @@ public class KylinOrderTickets implements Serializable {
      *
      * @return
      */
-    public Object[] getPayAgainObject() {
+    public Object[] getPayAgainObject(LocalDateTime updateTime,LocalDateTime createTime) {
         return new Object[]{
-                orderType, updatedAt, orderCode, orderTicketsId
+                orderType, updatedAt, orderCode, orderTicketsId,updateTime,createTime
         };
     }
 
@@ -223,9 +223,9 @@ public class KylinOrderTickets implements Serializable {
      *
      * @return
      */
-    public Object[] getSynOrderObject() {
+    public Object[] getSynOrderObject(LocalDateTime updateTime,LocalDateTime createTime) {
         return new Object[]{
-                paymentType, payCode, timePay, qrCode, updatedAt, orderTicketsId
+                paymentType, payCode, timePay, qrCode, updatedAt, orderTicketsId,updateTime,createTime
         };
     }
 
@@ -234,9 +234,9 @@ public class KylinOrderTickets implements Serializable {
      *
      * @return
      */
-    public Object[] getCloseOrderObject() {
+    public Object[] getCloseOrderObject(LocalDateTime updateTime,LocalDateTime createTime) {
         return new Object[]{
-                updatedAt, orderTicketsId
+                updatedAt, orderTicketsId,updateTime,createTime
         };
     }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/docu/db_ln_adam_initialdata.sql

@@ -58,9 +58,9 @@ create table adam_user
     passwd     varchar(64),
     pay_code   varchar(64),
     state      tinyint comment '1-NORMAL,2-INVALID',
-    created_at datetime    not null,
-    updated_at datetime,
-    closed_at  datetime,
+    created_at datetime(3) not null,
+    updated_at datetime(3),
+    closed_at  datetime(3),
     comment    text
 ) ENGINE = InnoDB comment '用户';
 
@@ -96,8 +96,8 @@ create table adam_real_name
     name         varchar(30)                not null comment '真实姓名',
     id_card      varchar(50)                not null comment '证件号码',
     state        tinyint                    not null comment '0-INIT,1-NORMAL,2-INVALID',
-    created_at   datetime                   not null,
-    updated_at   datetime,
+    created_at   datetime(3)                not null,
+    updated_at   datetime(3),
     comment      text
 ) engine = InnoDB comment '实名信息';
 
@@ -117,9 +117,9 @@ create table adam_enters
     is_default boolean     not null default false comment '是否为默认:0-否,1-是，第一个入默认1',
     #     is_certification enum ('yes','no')          not null default 'no' comment '入场人的身份证号是否认证',
     state      tinyint     not null comment '状态:0-INIT,1-NORMAL,2-INVALID',
-    created_at datetime    not null,
-    updated_at datetime,
-    deleted_at datetime,
+    created_at datetime(3) not null,
+    updated_at datetime(3),
+    deleted_at datetime(3),
     comment    text
 ) engine = InnoDB comment ='入场人';
 
@@ -141,9 +141,9 @@ create table adam_addresses
     is_default   boolean                     not null default false comment '是否为默认:0-否,1-是,第一个默认1',
     #     is_certification enum ('yes','no')          not null default 'no' comment '入场人的身份证号是否认证',
     state        tinyint                     not null comment '状态:0-INIT,1-NORMAL,2-INVALID',
-    created_at   datetime                    not null,
-    updated_at   datetime,
-    deleted_at   datetime,
+    created_at   datetime(3)                 not null,
+    updated_at   datetime(3),
+    deleted_at   datetime(3),
     comment      text
 ) engine = InnoDB comment '收货地址';
 
@@ -165,9 +165,9 @@ create index idx_addresses_uid on adam_addresses (uid);
 #     mobile        varchar(50)                                                  not null comment '手机号',
 #     admin_id      int                                       default 0          not null comment '处理人',
 #     admin_name    varchar(255)                              default ''         not null comment '处理人姓名',
-#     admin_time    datetime                                                     null comment '处理时间',
-#     created_at    datetime                                                     not null,
-#     updated_at    datetime
+#     admin_time    datetime(3)                                                     null comment '处理时间',
+#     created_at    datetime(3)                                                     not null,
+#     updated_at    datetime(3)
 # ) engine = InnoDB comment '反馈';
 -- >>------------------------------------------------------------------------------------
 drop table if exists adam_collection;
@@ -178,8 +178,8 @@ create table adam_collection
     content_id varchar(64)       not null,
     type       varchar(30)       not null comment '收藏类型:VIDEO,TICKET,SITE,ARTIST,BAND,BRAND,STYLE,GOODS,MUSIC,SONG',
     state      tinyint default 1 not null comment '1-正常,2-删除',
-    created_at datetime          not null,
-    updated_at datetime,
+    created_at datetime(3)       not null,
+    updated_at datetime(3),
     comment    text
 ) engine = InnoDB comment '收藏';
 
@@ -193,8 +193,8 @@ create table adam_disposed
     content_id int unsigned                not null,
     type       varchar(30)                 not null comment '想去类型:TICKET',
     state      tinyint default 1           not null comment '1-正常,2-删除',
-    created_at datetime                    not null,
-    updated_at datetime,
+    created_at datetime(3)                 not null,
+    updated_at datetime(3),
     comment    text
 ) engine = InnoDB comment '想去';
 create index idx_disposed_uid on adam_disposed (uid);
@@ -215,8 +215,8 @@ create table adam_member
     interests_detail  text comment '权益详情',
     #     gift_pack_id     varchar(64) comment '礼包ID',
     notes             text         NOT NULL COMMENT '注意事项',
-    created_at        datetime,
-    updated_at        datetime,
+    created_at        datetime(3),
+    updated_at        datetime(3),
     is_notice         tinyint comment '是否展示须知',
     notice_info       text comment '须知内容',
     notice_title      varchar(255),
@@ -239,8 +239,8 @@ create table adam_member_price
     price_fixed     decimal(8, 2) comment '折扣价',
     days            int                                                          NOT NULL DEFAULT '0' COMMENT '会员包天数',
     detail          text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci        NOT NULL COMMENT '会员包须知',
-    created_at      datetime,
-    updated_at      datetime,
+    created_at      datetime(3),
+    updated_at      datetime(3),
     comment         text
 );
 -- >>------------------------------------------------------------------------------------
@@ -263,9 +263,9 @@ create table adam_member_order
     device_from     varchar(20) comment '支付终端:app,wap,js,applet',
     pay_type        varchar(20) comment '支付方式:alipay,wepay,vipcode,giftcode',
     pay_no          varchar(64) comment '支付订单',
-    payment_at      datetime    default null comment '支付时间',
-    created_at      datetime,
-    updated_at      datetime,
+    payment_at      datetime(3) default null comment '支付时间',
+    created_at      datetime(3),
+    updated_at      datetime(3),
     client_ip       varchar(50),
     source          varchar(20),
     version         varchar(20),
@@ -280,9 +280,9 @@ create table adam_user_member
     member_id  varchar(255) comment '会员类型id',
     member_no  int unsigned not null,
     state      tinyint comment '1-NORMAL,2-INVALID',
-    expiry_at  datetime comment '到期日期',
-    created_at datetime,
-    updated_at datetime,
+    expiry_at  datetime(3) comment '到期日期',
+    created_at datetime(3),
+    updated_at datetime(3),
     comment    text
 );
 -- >>------------------------------------------------------------------------------------
@@ -296,14 +296,14 @@ create table adam_member_code
     member_price_id varchar(255) comment '会员价格ID',
     member_no       varchar(20) comment '预留会员号',
     state           tinyint comment '0-未用,1-已用,2-失效',
-    created_at      datetime,
-    updated_at      datetime,
+    created_at      datetime(3),
+    updated_at      datetime(3),
     buy_order_no    varchar(255) default null comment '购买会员码订单号',
     buy_uid         varchar(255) default null comment '购买会员码用户id',
-    buy_at          datetime     default null comment '购买时间',
+    buy_at          datetime(3)  default null comment '购买时间',
     use_order_no    varchar(64)  default null comment '消费订单号',
     use_uid         varchar(64)  default null comment '消费用户ID',
-    use_at          datetime     default null,
+    use_at          datetime(3)  default null,
     comment         text
 );
 -- >>------------------------------------------------------------------------------------

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/constant/AdamRedisConst.java

@@ -27,8 +27,7 @@ public class AdamRedisConst {
     public static final String INFO_MEMBER_AGREEMENT = INFO.concat("member:agreement");
     public static final String INFO_MEMBER_CODE = INFO.concat("member:code:");
 
-    public static final String SHOT = "shot:";
-    public static final String SHOT_MEMBER_ORDER = SHOT.concat("morder:");
+    public static final String SHOT_MEMBER_ORDER = ADAM.concat("morder:");
 
     public static final String INFO_TAGS_SEX = INFO.concat("tags:sex");
     public static final String INFO_TAGS_MUSIC = INFO.concat("tags:music");

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/AdamLoginController.java

@@ -25,6 +25,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.DigestUtils;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.validation.annotation.Validated;
@@ -67,6 +68,11 @@ public class AdamLoginController {
     @Autowired
     IAdamRdmService adamRdmService;
 
+
+
+    private static final String PHP_API_SMS_CODE_SEND = "/smsCode";
+    private static final String PHP_API_SMS_CODE_VALID = "/smsValidation";
+
     /*@ApiOperationSupport(order = 1)
     @ApiOperation(value = "手机号密码登录")
     @ApiImplicitParams({
@@ -93,21 +99,24 @@ public class AdamLoginController {
 
         LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
         paramsMap.add("mobile", mobile);
-        LinkedMultiValueMap<String, String> headersMap = new LinkedMultiValueMap<>();
-        headersMap.add("token", null);
 
+        String respStr = null;
         try {
-            // TODO: 2021/5/12
-            String respStr = HttpUtil.post("https://service.zhengzai.tv/smsCode", paramsMap, headersMap);
-            log.info("###PHP.API[{}].RESP[{}]", "https://service.zhengzai.tv/smsCode", respStr);
+            respStr = HttpUtil.postToPhpApi(env.getProperty("liquidnet.url-service.url") + PHP_API_SMS_CODE_SEND, paramsMap);
+            log.debug("###PHP.API[{}].RESP[{}]", PHP_API_SMS_CODE_SEND, respStr);
 
-//            Map respMap = JsonUtils.fromJson(respStr, Map.class);
+            Map respMap = JsonUtils.fromJson(respStr, Map.class);
 
+            if (!CollectionUtils.isEmpty(respMap) && StringUtils.equalsIgnoreCase("OK", (String) respMap.get("message"))) {
+                return ResponseDto.success();
+            } else {
+                log.warn("PHP.API验证码发送失败[mobile:{},respStr:{}]", mobile, respStr);
+                return ResponseDto.failure(ErrorMapping.get("10001"));
+            }
         } catch (Exception e) {
-            log.error("验证码发送异常[mobile:{}]", mobile, e);
+            log.error("PHP.API验证码发送异常[mobile:{},respStr:{}]", mobile, respStr, e);
             return ResponseDto.failure(ErrorMapping.get("10001"));
         }
-        return ResponseDto.success();
     }
 
     @ApiOperationSupport(order = 3)
@@ -168,7 +177,7 @@ public class AdamLoginController {
         loginInfoVo.setMemberVo(adamRdmService.getMemberSimpleVo());
         loginInfoVo.setUserInfo(userInfoVo);
         loginInfoVo.setToken(this.ssoProcess(userInfoVo));
-        return ResponseDto.success(AdamLoginInfoVo.getNew());
+        return ResponseDto.success(loginInfoVo);
     }
 
     @ApiOperationSupport(order = 5)
@@ -229,26 +238,27 @@ public class AdamLoginController {
     /* ---------------------------- Internal Method ---------------------------- */
 
     private boolean checkSmsCode(String mobile, String code) {
-        if (Arrays.asList("dev", "test").contains(env.getProperty("spring.profiles.active"))) {
-            return "111111".equals(code);
+        if (Arrays.asList("dev", "test").contains(env.getProperty("spring.profiles.active")) && "111111".equals(code)) {
+            return true;
         }
 
         LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
         paramsMap.add("mobile", mobile);
         paramsMap.add("code", code);
-        LinkedMultiValueMap<String, String> headersMap = new LinkedMultiValueMap<>();
-        headersMap.add("token", null);
 
+        String respStr = null;
         try {
-            // TODO: 2021/5/12
-            String respStr = HttpUtil.get("https://service.zhengzai.tv/smsValidation", paramsMap, headersMap);
-            log.info("###PHP.API.RESP:{}", respStr);
-
+            respStr = HttpUtil.postToPhpApi(env.getProperty("liquidnet.url-service.url") + PHP_API_SMS_CODE_VALID, paramsMap);
+            log.debug("###PHP.API[{}].RESP:{}", PHP_API_SMS_CODE_VALID, respStr);
             Map respMap = JsonUtils.fromJson(respStr, Map.class);
-
-            return StringUtils.equalsIgnoreCase("OK", (String) respMap.get("message"));
+            if (!CollectionUtils.isEmpty(respMap) && StringUtils.equalsIgnoreCase("OK", (String) respMap.get("message"))) {
+                return true;
+            } else {
+                log.warn("PHP.API验证码验证失败[mobile:{},code:{},respStr:{}]", mobile, code, respStr);
+                return false;
+            }
         } catch (Exception e) {
-            log.error("验证码验证异常[mobile:{},code:{}]", mobile, code, e);
+            log.error("PHP.API验证码验证异常[mobile:{},code:{},respStr:{}]", mobile, code, respStr, e);
             return false;
         }
     }
@@ -263,8 +273,9 @@ public class AdamLoginController {
             if (!Objects.isNull(response) && response.getCode().equalsIgnoreCase("OK")) {
                 return response.getGetMobileResultDTO().getMobile();
             }
+            log.warn("aliyun.dypns.api.response:{},{}", JsonUtils.toJson(response), accessToken);
         } catch (ClientException e) {
-            log.error("error:aliyun.dypns.api:{}", accessToken, e);
+            log.error("aliyun.dypns.api:{}", accessToken, e);
         }
         return null;
     }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamAddressesServiceImpl.java

@@ -67,7 +67,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
 
         mongoTemplate.insert(vo, AdamAddressesVo.class.getSimpleName());
 
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                 SqlMapping.get("adam_addresses.add",
                         vo.getAddressesId(), vo.getUid(), vo.getName(), vo.getPhone(), vo.getProvince(), vo.getCity(), vo.getCounty(), vo.getAddress(), vo.getIsDefault(), vo.getState(), now
                 )
@@ -124,7 +124,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
             }
         }
         if (!CollectionUtils.isEmpty(toMqObjs)) {
-            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+            rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                     SqlMapping.get("adam_addresses.update.is_default", toMqObjs));
             adamRdmService.setAddressesVoByUid(uid, vos);
         }
@@ -146,7 +146,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
         );
         if (null != doc) {
             updateVo = BsonUtil.toBean(doc, AdamAddressesVo.class);
-            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+            rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                     SqlMapping.get("adam_addresses.edit",
                             updateVo.getName(), updateVo.getPhone(), updateVo.getProvince(), updateVo.getCity(), updateVo.getCounty(), updateVo.getAddress(), now, updateVo.getAddressesId()
                     )
@@ -179,7 +179,7 @@ public class AdamAddressesServiceImpl implements IAdamAddressesService {
                 new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
         );
         if (null != doc) {
-            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+            rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                     SqlMapping.get("adam_addresses.remove", now, now, addressesId)
             );
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamCollectionServiceImpl.java

@@ -66,7 +66,7 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
 
         mongoTemplate.insert(vo, AdamCollectBaseVo.class.getSimpleName());
 
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                 SqlMapping.get("adam_collection.add",
                         vo.getUid(), vo.getContentId(), vo.getType(), vo.getState(), now
                 )
@@ -98,7 +98,7 @@ public class AdamCollectionServiceImpl implements IAdamCollectionService {
             for (String c : contentIds) {
                 toMqObjs.add(new Object[]{now, uid, c});
             }
-            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+            rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                     SqlMapping.get("adam_collection.del", toMqObjs));
         }
     }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamDisposedServiceImpl.java

@@ -64,7 +64,7 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
 
         mongoTemplate.insert(vo, AdamDisposedBaseVo.class.getSimpleName());
 
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                 SqlMapping.get("adam_disposed.add",
                         vo.getUid(), vo.getContentId(), vo.getType(), vo.getState(), now
                 )
@@ -95,7 +95,7 @@ public class AdamDisposedServiceImpl implements IAdamDisposedService {
             for (String c : contentIds) {
                 toMqObjs.add(new Object[]{now, uid, c});
             }
-            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+            rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                     SqlMapping.get("adam_disposed.del", toMqObjs));
         }
     }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamEntersServiceImpl.java

@@ -69,7 +69,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
 
         mongoTemplate.insert(vo, AdamEntersVo.class.getSimpleName());
 
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                 SqlMapping.get("adam_enters.add",
                         vo.getEntersId(), vo.getUid(), vo.getType(), vo.getName(), vo.getMobile(), vo.getIdCard(), vo.getIsDefault(), vo.getState(), now
                 )
@@ -127,7 +127,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
             }
         }
         if (!CollectionUtils.isEmpty(toMqObjs)) {
-            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+            rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                     SqlMapping.get("adam_enters.update.is_default", toMqObjs));
             adamRdmService.setEntersVoByUid(uid, vos);
         }
@@ -149,7 +149,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
         );
         if (null != doc) {
             updateVo = BsonUtil.toBean(doc, AdamEntersVo.class);
-            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+            rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                     SqlMapping.get("adam_enters.edit",
                             updateVo.getType(), updateVo.getName(), updateVo.getMobile(), updateVo.getIdCard(), updateVo.getIsDefault(), updateVo.getState(), now, updateVo.getEntersId()
                     )
@@ -183,7 +183,7 @@ public class AdamEntersServiceImpl implements IAdamEntersService {
                 new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
         );
         if (null != doc) {
-            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+            rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                     SqlMapping.get("adam_enters.remove", now, now, entersId)
             );
 

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamMemberOrderServiceImpl.java

@@ -284,7 +284,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
                 handleMemberOrderVo.getDeviceFrom(), handleMemberOrderVo.getPayType(), handleMemberOrderVo.getPayNo(), handleMemberOrderVo.getPaymentAt(),
                 handleMemberOrderVo.getCreatedAt(), handleMemberOrderVo.getClientIp(), handleMemberOrderVo.getSource(), handleMemberOrderVo.getVersion()
         });
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                 SqlMapping.gets(toMqSqls, operationObjs, updateMemberOrderObjs));
 
         adamRdmService.setShotMemberOrderVoByOrderNo(handleMemberOrderVo.getUid(), handleMemberOrderVo.getOrderNo(), handleMemberOrderVo);
@@ -382,7 +382,7 @@ public class AdamMemberOrderServiceImpl extends ServiceImpl<AdamMemberOrderMappe
         adamRdmService.setUserMemberVoByUid(initMemberOrderVo.getUid(), initUserMemberVo);
         adamRdmService.delMemberCodeVoByCode(memberCodeVo.getCode());
 
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                 SqlMapping.gets(toMqSqls, updateMemberCodeObjs, initMemberOrderObjs, initUserMemberObjs));
 
         AdamMemberOrderResult result = AdamMemberOrderResult.getNew();

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamRdmServiceImpl.java

@@ -10,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Field;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
@@ -34,7 +35,15 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
 
     @Override
     public String getUidByMobile(String mobile) {
-        return (String) redisUtil.get(AdamRedisConst.IDENTITY_MOBILE.concat(mobile));
+        String key = AdamRedisConst.IDENTITY_MOBILE.concat(mobile);
+        String val = (String) redisUtil.get(key);
+        if (StringUtils.isEmpty(val)) {
+            Query query = Query.query(Criteria.where("mobile").is(mobile).and("state").is(1));
+            query.fields().include("uid");
+            AdamUserInfoVo vo = mongoTemplate.findOne(query, AdamUserInfoVo.class, AdamUserInfoVo.class.getSimpleName());
+            if (null != vo) redisUtil.set(key, vo.getUid());
+        }
+        return val;
     }
 
     @Override
@@ -44,17 +53,25 @@ public class AdamRdmServiceImpl implements IAdamRdmService {
 
     @Override
     public boolean setUidByPlatformOpenId(String platform, String openId, String uid) {
-        return redisUtil.set(AdamRedisConst.IDENTITY_THIRD_PARTY.concat(platform).concat(openId), uid);
+        return redisUtil.set(AdamRedisConst.IDENTITY_THIRD_PARTY + platform + ":" + openId, uid);
     }
 
     @Override
     public String getUidByPlatformOpenId(String platform, String openId) {
-        return (String) redisUtil.get(AdamRedisConst.IDENTITY_THIRD_PARTY.concat(platform).concat(openId));
+        String key = AdamRedisConst.IDENTITY_THIRD_PARTY + platform + ":" + openId;
+        String val = (String) redisUtil.get(key);
+        if (StringUtils.isEmpty(val)) {
+            Query query = Query.query(Criteria.where("openId").is(openId).and("platform").is(platform).and("state").is(1));
+            query.fields().include("uid");
+            AdamThirdPartInfoVo vo = mongoTemplate.findOne(query, AdamThirdPartInfoVo.class, AdamThirdPartInfoVo.class.getSimpleName());
+            if (null != vo) redisUtil.set(key, vo.getUid());
+        }
+        return val;
     }
 
     @Override
     public void delUidByPlatformOpenId(String platform, String openId) {
-        redisUtil.del(AdamRedisConst.IDENTITY_THIRD_PARTY.concat(platform).concat(openId));
+        redisUtil.del(AdamRedisConst.IDENTITY_THIRD_PARTY + platform + ":" + openId);
     }
 
     @Override

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamRealNameServiceImpl.java

@@ -49,7 +49,7 @@ public class AdamRealNameServiceImpl extends ServiceImpl<AdamRealNameMapper, Ada
                 realName.getState(),
                 realName.getCreatedAt()
         );
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                 SqlMapping.get("adam_real_name.add", paramList.toArray()));
     }
 }

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserInfoServiceImpl.java

@@ -68,7 +68,7 @@ public class AdamUserInfoServiceImpl extends ServiceImpl<AdamUserInfoMapper, Ada
                 userInfoVo.getTagMe(),
                 userInfoVo.getUid()
         );
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                 SqlMapping.get(userInfoVo.getIsComplete() == 0 ? "adam_user_info.add" : "adam_user_info.edit", paramList.toArray()));
 
         adamRdmService.setUserInfoVoByUid(userInfoVo.getUid(), userInfoVo);
@@ -88,7 +88,7 @@ public class AdamUserInfoServiceImpl extends ServiceImpl<AdamUserInfoMapper, Ada
                 new FindOneAndUpdateOptions().returnDocument(ReturnDocument.BEFORE)
         );
         AdamUserInfoVo beforeUserInfoVo = BsonUtil.toBean(doc, AdamUserInfoVo.class);
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                 SqlMapping.get("adam_user.edit.mobile", mobile, now, uid));
 
         adamRdmService.delUidByMobile(beforeUserInfoVo.getMobile());

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserServiceImpl.java

 package com.liquidnet.service.adam.service.impl;
 
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.common.mq.constant.MQConst;
 import com.liquidnet.commons.lang.util.DateUtil;
+import com.liquidnet.commons.lang.util.HttpUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.adam.dto.AdamThirdPartParam;
 import com.liquidnet.service.adam.dto.vo.*;
-import com.liquidnet.service.adam.entity.AdamAddresses;
 import com.liquidnet.service.adam.entity.AdamEnters;
 import com.liquidnet.service.adam.entity.AdamRealName;
-import com.liquidnet.service.adam.entity.AdamUser;
-import com.liquidnet.service.adam.mapper.AdamUserMapper;
 import com.liquidnet.service.adam.service.*;
+import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.SqlMapping;
-import com.mongodb.BasicDBObject;
 import com.mongodb.client.model.FindOneAndUpdateOptions;
 import com.mongodb.client.model.ReturnDocument;
 import com.mongodb.client.result.DeleteResult;
-import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -26,19 +23,20 @@ import org.bson.Document;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.core.env.Environment;
 import org.springframework.data.mongodb.core.MongoTemplate;
-import org.springframework.data.mongodb.core.convert.MongoConverter;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
+import org.springframework.util.LinkedMultiValueMap;
 
 import java.time.LocalDateTime;
-import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -50,9 +48,9 @@ import java.util.List;
  */
 @Slf4j
 @Service
-public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> implements IAdamUserService {
+public class AdamUserServiceImpl implements IAdamUserService {
     @Autowired
-    MongoConverter mongoConverter;
+    Environment env;
     @Autowired
     MongoTemplate mongoTemplate;
     @Autowired
@@ -66,6 +64,10 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
     @Autowired
     IAdamRdmService adamRdmService;
 
+
+
+    private static final String PHP_API_REAL_NAME = "/IdCardCheckVerification";
+
 //    @Override
 //    public AdamUserInfoVo queryByUid(String uid) {
 //        AdamUserInfoVo userInfoVo = (AdamUserInfoVo) redisUtil.hget(AdamRedisConst.INFO_USER, uid);
@@ -104,7 +106,7 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
 
         mongoTemplate.insert(userInfoVo, AdamUserInfoVo.class.getSimpleName());
 
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                 SqlMapping.get("adam_user.add", userInfoVo.getUid(), userInfoVo.getMobile(), userInfoVo.getState(), now)
         );
 
@@ -152,7 +154,7 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
         toMqSqls.add(SqlMapping.get("adam_third_party.add"));
         initThirdPartObjs.add(new Object[]{thirdPartInfoVo.getUid(), thirdPartInfoVo.getOpenId(), thirdPartInfoVo.getAvatar(), thirdPartInfoVo.getNickname(), thirdPartInfoVo.getPlatform(), thirdPartInfoVo.getState(), thirdPartInfoVo.getCreatedAt()});
 
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                 SqlMapping.gets(toMqSqls, initUserObjs, initThirdPartObjs)
         );
 
@@ -179,7 +181,7 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
 
         adamRdmService.delThirdPartVoListByUid(uid);
 
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                 SqlMapping.get(
                         "adam_third_party.add",
                         thirdPartInfoVo.getUid(), thirdPartInfoVo.getOpenId(), thirdPartInfoVo.getAvatar(), thirdPartInfoVo.getNickname(), thirdPartInfoVo.getPlatform(), thirdPartInfoVo.getState(), thirdPartInfoVo.getCreatedAt()
@@ -207,7 +209,7 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
 
         adamRdmService.delThirdPartVoListByUid(bindUid);
 
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                 SqlMapping.get(
                         "adam_third_party.add",
                         thirdPartInfoVo.getUid(), thirdPartInfoVo.getOpenId(), thirdPartInfoVo.getAvatar(), thirdPartInfoVo.getNickname(), thirdPartInfoVo.getPlatform(), thirdPartInfoVo.getState(), thirdPartInfoVo.getCreatedAt()
@@ -231,7 +233,7 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
 
         Document doc = mongoTemplate.getCollection(AdamThirdPartInfoVo.class.getSimpleName()).findOneAndUpdate(
                 Query.query(Criteria.where("uid").is(uid).and("platform").is(platform).and("state").is(1)).getQueryObject(),
-                new BasicDBObject("$set", mongoConverter.convertToMongoType(unBindThirdPartInfoVo)),
+                new Document("$set", Document.parse(JsonUtils.toJson(unBindThirdPartInfoVo))),
                 new FindOneAndUpdateOptions().returnDocument(ReturnDocument.AFTER)
         );
 
@@ -240,7 +242,7 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
         }
         adamRdmService.delThirdPartVoListByUid(uid);
 
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                 SqlMapping.get("adam_third_party.unbind", now, uid, platform));
     }
 
@@ -307,15 +309,35 @@ public class AdamUserServiceImpl extends ServiceImpl<AdamUserMapper, AdamUser> i
             objsAddresses.add(new Object[]{now, now, uid});
         }
 
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
                 SqlMapping.gets(toMqSqls, objsUser));
     }
 
     @Override
-    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
+//    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public AdamRealInfoVo identity(String uid, String name, String idCard) {
         // TODO: 2021/5/18 调用第三方认证服务
 
+        LinkedMultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
+        paramsMap.add("realName", name);
+        paramsMap.add("cardNo", idCard);
+
+        String respStr = null;
+        try {
+            respStr = HttpUtil.postToPhpApi(env.getProperty("liquidnet.url-service.url") + PHP_API_REAL_NAME, paramsMap);
+            log.debug("###PHP.API[{}].RESP:{}", PHP_API_REAL_NAME, respStr);
+            Map respMap = JsonUtils.fromJson(respStr, Map.class);
+            if (CollectionUtils.isEmpty(respMap) || !StringUtils.equalsIgnoreCase("OK", (String) respMap.get("message"))) {
+                log.warn("PHP.API实名认证失败[uid:{},name:{},idCard:{},respStr:{}]", uid, name, idCard, respStr);
+                ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
+                throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+            }
+        } catch (Exception e) {
+            log.error("PHP.API实名认证异常[uid:{},name:{},idCard:{},respStr:{}]", uid, name, idCard, respStr, e);
+            ErrorMapping.ErrorMessage errorMessage = ErrorMapping.get("10102");
+            throw new LiquidnetServiceException(errorMessage.getCode(), errorMessage.getMessage());
+        }
+
         AdamRealName realName = new AdamRealName();
         realName.setRealNameId(IDGenerator.nextSnowId() + "");
         realName.setUid(uid);

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/resources/errors.properties

@@ -24,7 +24,7 @@
 
 
 10101=姓名或身份证件号无效
-10102=
+10102=实名认证失败
 10103=
 10104=
 10105=入场人不存在

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

 package com.liquidnet.service.consumer.service.impl;
 
+import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.consumer.service.IBaseDao;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.dao.DataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.PreparedStatementCreator;
 import org.springframework.jdbc.datasource.DataSourceTransactionManager;
@@ -21,7 +21,6 @@ import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.LinkedList;
-import java.util.List;
 
 @Service
 public class BaseDao implements IBaseDao {
@@ -37,7 +36,7 @@ public class BaseDao implements IBaseDao {
             @Override
             public Boolean doInTransaction(final TransactionStatus transactionStatus) {
                 if (values.size() > 0) {
-                    jdbcTemplate.batchUpdate(sql, values);
+                    int[] ints = jdbcTemplate.batchUpdate(sql, values);
                 }
                 return true;
             }
@@ -46,7 +45,7 @@ public class BaseDao implements IBaseDao {
             TransactionTemplate tt = new TransactionTemplate(transactionManager);
             return tt.execute(callback);
         } catch (Exception ex) {
-            log.error("###SQL.Preparing:{}\nParameters:{}", JsonUtils.toJson(sql), JsonUtils.toJson(values), ex);
+            log.error("###\nSQL.Preparing:{}\nParameters:{}", JsonUtils.toJson(sql), JsonUtils.toJson(values), ex);
             return false;
         }
     }
@@ -63,7 +62,13 @@ public class BaseDao implements IBaseDao {
                         break;
                     }
                     if (!o.isEmpty()) {
-                        jdbcTemplate.batchUpdate(sql.get(i), o);
+                        int[] ints = jdbcTemplate.batchUpdate(sql.get(i), o);
+
+                        for (int c : ints) {
+                            if (c <= 0) {
+                                throw new LiquidnetServiceException("NON.SQL", sql.get(i));
+                            }
+                        }
                     }
                     i++;
                 }
@@ -106,7 +111,7 @@ public class BaseDao implements IBaseDao {
                 }
             }, keyHolder);
         } catch (Exception e) {
-            log.error("###SQL.Preparing:{}\nParameters:{}", sql, JsonUtils.toJson(param), e);
+            log.error("###\nSQL.Preparing:{}\nParameters:{}", sql, JsonUtils.toJson(param), e);
         }
         return keyHolder.getKey().intValue();
 

liquidnet-bus-service/liquidnet-service-consumer/src/main/java/com/liquidnet/service/consumer/service/processor/ConsumerProcessor.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.amqp.core.Message;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 
 /**
  * ConsumerProcessor.class
@@ -35,16 +36,26 @@ public class ConsumerProcessor {
 //    }
 
     @RabbitListener(queues = MQConst.QUEUES_SQL_MAIN)
-    public void consumerSql(String msg) {
-        SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(msg, SqlMapping.SqlMessage.class);
+    public void consumerSql(Message msg, Channel channel) {
+        SqlMapping.SqlMessage sqlMessage = JsonUtils.fromJson(new String(msg.getBody()), SqlMapping.SqlMessage.class);
         log.debug("consumer sql ==> Preparing:{}", JsonUtils.toJson(sqlMessage.getSqls()));
         log.debug("consumer sql ==> Parameters:{}", JsonUtils.toJson(sqlMessage.getArgs()));
 
         try {
             Boolean rstBatchSqls = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
-            log.debug("batchSqls result of execution:{}", rstBatchSqls);
+            log.debug("consumer sql result of execution:{}", rstBatchSqls);
+            if (rstBatchSqls) {
+                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
+            } else {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            }
         } catch (Exception e) {
-            log.error("error:sqlMessage:{}", JsonUtils.toJson(sqlMessage), e);
+            log.error("error:consumer sql:{}", JsonUtils.toJson(sqlMessage), e);
+            try {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            } catch (IOException ioException) {
+                log.error("error:consumer sql:basicReject.msg.tag:{}", msg.getMessageProperties().getDeliveryTag(), ioException);
+            }
         }
     }
 
@@ -60,12 +71,17 @@ public class ConsumerProcessor {
             Boolean rstBatchSqls = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
             log.debug("CONSUMER_ORDER_CREATE result of execution:{}", rstBatchSqls);
             if (rstBatchSqls) {
-                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), true);
+                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
             } else {
                 channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
             }
         } catch (Exception e) {
-            log.error("error:sqlMessage:{}", JsonUtils.toJson(sqlMessage), e);
+            log.error("error:consumer sql2:{}", JsonUtils.toJson(sqlMessage), e);
+            try {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            } catch (IOException ioException) {
+                log.error("error:consumer sql2:basicReject.msg.tag:{}", msg.getMessageProperties().getDeliveryTag(), ioException);
+            }
         }
     }
 
@@ -81,12 +97,17 @@ public class ConsumerProcessor {
             Boolean rstBatchSqls = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
             log.debug("CONSUMER_ORDER_PAY_AGAIN result of execution:{}", rstBatchSqls);
             if (rstBatchSqls) {
-                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), true);
+                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
             } else {
                 channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
             }
         } catch (Exception e) {
-            log.error("error:sqlMessage:{}", JsonUtils.toJson(sqlMessage), e);
+            log.error("error:consumer sql2:{}", JsonUtils.toJson(sqlMessage), e);
+            try {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            } catch (IOException ioException) {
+                log.error("error:consumer sql2:basicReject.msg.tag:{}", msg.getMessageProperties().getDeliveryTag(), ioException);
+            }
         }
     }
 
@@ -102,12 +123,17 @@ public class ConsumerProcessor {
             Boolean rstBatchSqls = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
             log.debug("CONSUMER_ORDER_CLOSE result of execution:{}", rstBatchSqls);
             if (rstBatchSqls) {
-                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), true);
+                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
             } else {
                 channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
             }
         } catch (Exception e) {
-            log.error("error:sqlMessage:{}", JsonUtils.toJson(sqlMessage), e);
+            log.error("error:consumer sql2:{}", JsonUtils.toJson(sqlMessage), e);
+            try {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            } catch (IOException ioException) {
+                log.error("error:consumer sql2:basicReject.msg.tag:{}", msg.getMessageProperties().getDeliveryTag(), ioException);
+            }
         }
     }
 
@@ -123,12 +149,17 @@ public class ConsumerProcessor {
             Boolean rstBatchSqls = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
             log.debug("CONSUMER_ORDER_PAY result of execution:{}", rstBatchSqls);
             if (rstBatchSqls) {
-                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), true);
+                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
             } else {
                 channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
             }
         } catch (Exception e) {
-            log.error("error:sqlMessage:{}", JsonUtils.toJson(sqlMessage), e);
+            log.error("error:consumer sql2:{}", JsonUtils.toJson(sqlMessage), e);
+            try {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            } catch (IOException ioException) {
+                log.error("error:consumer sql2:basicReject.msg.tag:{}", msg.getMessageProperties().getDeliveryTag(), ioException);
+            }
         }
     }
 
@@ -144,12 +175,17 @@ public class ConsumerProcessor {
             Boolean rstBatchSqls = baseDao.batchSqls(sqlMessage.getSqls(), sqlMessage.getArgs());
             log.debug("CONSUMER_PERFORMANCE_LACK result of execution:{}", rstBatchSqls);
             if (rstBatchSqls) {
-                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), true);
+                channel.basicAck(msg.getMessageProperties().getDeliveryTag(), false);
             } else {
                 channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
             }
         } catch (Exception e) {
-            log.error("error:sqlMessage:{}", JsonUtils.toJson(sqlMessage), e);
+            log.error("error:consumer sql2:{}", JsonUtils.toJson(sqlMessage), e);
+            try {
+                channel.basicReject(msg.getMessageProperties().getDeliveryTag(), true);
+            } catch (IOException ioException) {
+                log.error("error:consumer sql2:basicReject.msg.tag:{}", msg.getMessageProperties().getDeliveryTag(), ioException);
+            }
         }
     }
 }

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -21,8 +21,8 @@ CREATE TABLE `kylin_banners`
     `promotion_type`    tinyint      NOT NULL DEFAULT 1 COMMENT '推广类型 1全国 2省份',
     `banners_sort`      int          NOT NULL DEFAULT 0 COMMENT '排序 越大越靠前',
     `is_deleted`        tinyint      NOT NULL DEFAULT 1 COMMENT '是否删除 0已删除 1正常',
-    `created_at`        datetime     NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`        datetime     NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`        datetime(3)   NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`        datetime(3)     NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_banners_banners_id_index` (`banners_id`),
     KEY `kylin_banners_banners_name_index` (`banners_name`),
     KEY `kylin_banners_banners_sort_index` (`banners_sort`),
@@ -39,8 +39,8 @@ CREATE TABLE `kylin_banners_relations`
     `field_id`             int          NOT NULL DEFAULT 0 COMMENT '展示位置id/推广省份code',
     `field_name`           varchar(255) NOT NULL DEFAULT '' COMMENT '省份名称',
     `field_id_type`        tinyint      NOT NULL DEFAULT 1 COMMENT '关联字段类型 1展示位置(由接口提供) 2推广省份(由接口提供)',
-    `created_at`           datetime     NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`           datetime     NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`           datetime(3)     NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`           datetime(3)     NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_banners_relations_banners_relations_id_index` (`banners_relations_id`),
     KEY `kylin_banners_relations_banners_id_index` (`banners_id`),
     PRIMARY KEY (`mid`)
@@ -70,8 +70,8 @@ CREATE TABLE `kylin_fields`
     `district_name`  varchar(255) NOT NULL DEFAULT '' COMMENT '县名称',
     `refuse_message` varchar(255) NOT NULL DEFAULT '' COMMENT '拒绝理由',
     `comment`        varchar(255) NULL     DEFAULT '' COMMENT 'comment',
-    `created_at`     datetime     NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`     datetime     NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`     datetime(3)     NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`     datetime(3)     NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_fields_uid_index` (`fields_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
@@ -87,8 +87,8 @@ CREATE TABLE `kylin_field_status`
     `is_display`      tinyint      NOT NULL DEFAULT 1 COMMENT '是否显示 0不显示 1显示',
     `is_business`     tinyint      NOT NULL DEFAULT 0 COMMENT '是否营业 0不营业 1营业中',
     `change_status`   tinyint      NOT NULL DEFAULT 0 COMMENT '审核状态 0待审核 1已审核 2被拒绝',
-    `created_at`      datetime     NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`      datetime     NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`      datetime(3)     NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`      datetime(3)     NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_field_status_uid_index` (`field_status_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
@@ -100,8 +100,8 @@ CREATE TABLE `kylin_field_relations`
     `mid`                int(11)      NOT NULL AUTO_INCREMENT,
     `field_relations_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'field_relations_id',
     `field_id`           varchar(255) NOT NULL DEFAULT '' COMMENT '场地关联id',
-    `created_at`         datetime     NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`         datetime     NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`         datetime(3)     NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`         datetime(3)     NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_field_relations_uid_index` (`field_relations_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
@@ -139,8 +139,8 @@ CREATE TABLE `kylin_performances`
     `reject_txt`      varchar(255) NOT NULL DEFAULT '' COMMENT '拒绝理由',
     `sort`            int(11)      NOT NULL DEFAULT 0 COMMENT '权重 高则在上',
     `comment`         varchar(255) NULL     DEFAULT '' COMMENT 'comment',
-    `created_at`      datetime     NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`      datetime     NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`      datetime(3)     NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`      datetime(3)     NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_performances_uid_index` (`performances_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
@@ -163,8 +163,8 @@ CREATE TABLE `kylin_performance_status`
     `limit_count`           int(11)      NOT NULL DEFAULT 0 COMMENT '限购张数 0无限 (开启实名 则实名限购 未开始为账号限购)',
     `limit_count_member`    int(11)      NOT NULL DEFAULT 0 COMMENT '会员限购张数 0无限 (开启实名 则实名限购 未开始为账号限购)',
     `is_recommend`          tinyint(255) NOT NULL DEFAULT 0 COMMENT '是否推荐 0否 1是',
-    `created_at`            datetime     NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`            datetime     NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`            datetime(3)     NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`            datetime(3)     NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_performance_status_uid_index` (`performance_status_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
@@ -182,8 +182,8 @@ CREATE TABLE `kylin_performance_relations`
     `road_show_id`             varchar(255) NOT NULL DEFAULT '' COMMENT '巡演id',
     `project_id`               varchar(255) NOT NULL DEFAULT '' COMMENT '专题id',
     `video_id`                 varchar(255) NOT NULL DEFAULT '' COMMENT '视频id',
-    `created_at`               datetime     NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`               datetime     NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`               datetime(3)     NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`               datetime(3)     NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `performance_relations_uid_index` (`performance_relations_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
@@ -202,8 +202,8 @@ CREATE TABLE `kylin_performance_distributions`
     `second_agent_scale_money`     varchar(5)   NOT NULL DEFAULT '0' COMMENT '1级现金奖励占比',
     `second_agent_scale_barter`    varchar(5)   NOT NULL DEFAULT '0' COMMENT '2级积分奖励占比',
     `comment`                      varchar(255) NULL     DEFAULT '' COMMENT 'comment',
-    `created_at`                   datetime     NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`                   datetime     NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`                   datetime(3)     NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`                   datetime(3)     NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_performance_distributions_uid_index` (`performance_distributions_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
@@ -222,8 +222,8 @@ CREATE TABLE `kylin_ticket_times`
     `use_start`       datetime     NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '售票开始时间',
     `use_end`         datetime     NOT NULL DEFAULT '2000-01-01 12:00:00' COMMENT '售票结束时间',
     `comment`         varchar(255) NULL     DEFAULT '' COMMENT 'comment',
-    `created_at`      datetime     NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`      datetime     NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`      datetime(3)     NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`      datetime(3)     NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_ticket_times_uid_index` (`ticket_times_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
@@ -237,8 +237,8 @@ CREATE TABLE `kylin_ticket_time_relation`
     `ticket_time_relation_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'ticket_time_relation_id',
     `times_id`                varchar(255) NOT NULL DEFAULT '' COMMENT '场次id',
     `performance_id`          varchar(255) NOT NULL DEFAULT '' COMMENT '关联演出id',
-    `created_at`              datetime     NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`              datetime     NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`              datetime(3)     NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`              datetime(3)     NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_ticket_time_relation_uid_index` (`ticket_time_relation_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
@@ -268,8 +268,8 @@ CREATE TABLE `kylin_tickets`
     `pay_countdown_minute`  int(11)       NOT NULL DEFAULT 5 COMMENT '支付倒计时时间',
     `sale_remind_minute`    int(11)       NOT NULL DEFAULT 60 COMMENT '开票提醒倒计时（分钟数）',
     `comment`               varchar(255)  NULL     DEFAULT '' COMMENT 'comment',
-    `created_at`            datetime      NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`            datetime      NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`            datetime(3)      NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`            datetime(3)      NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_tickets_uid_index` (`tickets_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
@@ -303,8 +303,8 @@ CREATE TABLE `kylin_ticket_status`
     `is_member`          tinyint      NOT NULL DEFAULT 0 COMMENT '是否关联会员 0不是 1是',
     `is_agent`           tinyint      NOT NULL DEFAULT 0 COMMENT '是否关联代理 0不是 1是',
     `sync_damai`         tinyint      NOT NULL DEFAULT 0 COMMENT '是否同步大麦 0不关联 1关联',
-    `created_at`         datetime     NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`         datetime     NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`         datetime(3)     NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`         datetime(3)     NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_ticket_status_uid_index` (`ticket_status_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
@@ -317,8 +317,8 @@ CREATE TABLE `kylin_ticket_relations`
     `ticket_relations_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'ticket_relations_id',
     `ticket_id`           varchar(255) NOT NULL DEFAULT '' COMMENT '票关联id',
     `times_id`            varchar(255) NOT NULL DEFAULT '' COMMENT '关联场次id',
-    `created_at`          datetime     NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`          datetime     NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`          datetime(3)     NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`          datetime(3)     NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `ticket_relations_uid_index` (`ticket_relations_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
@@ -334,8 +334,8 @@ CREATE TABLE `kylin_road_shows`
     `img_poster`    varchar(255) NOT NULL DEFAULT '' COMMENT '巡演封面图',
     `status`        tinyint      NOT NULL DEFAULT 1 COMMENT '状态 0停用 1启用',
     `comment`       varchar(255) NULL     DEFAULT '' COMMENT 'comment',
-    `created_at`    datetime     NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`    datetime     NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`    datetime(3)     NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`    datetime(3)     NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_road_shows_uid_index` (`road_shows_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
@@ -355,8 +355,8 @@ CREATE TABLE `kylin_lack_registers`
     `user_mobile`       varchar(255) NOT NULL DEFAULT '' COMMENT '用户手机号',
     `send_status`       tinyint      NOT NULL DEFAULT 0 COMMENT '是否发送短信',
     `ip_address`        varchar(255) NOT NULL DEFAULT '' COMMENT 'IP 地址',
-    `created_at`        datetime     NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`        datetime     NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`        datetime(3)     NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`        datetime(3)     NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_lack_registers_uid_index` (`lack_registers_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
@@ -375,8 +375,8 @@ CREATE TABLE `kylin_projects`
     `open_goods`       tinyint(4)                           NOT NULL DEFAULT '0' COMMENT '是否开启 推荐商品',
     `open_tied`        tinyint(4)                           NOT NULL DEFAULT '0' COMMENT '是否开启 推荐搭售',
     `comment`          varchar(255)                         NULL     DEFAULT '' COMMENT 'comment',
-    `created_at`       datetime                             NULL     DEFAULT NULL,
-    `updated_at`       datetime                             NULL     DEFAULT NULL,
+    `created_at`       datetime(3)                             NULL     DEFAULT NULL,
+    `updated_at`       datetime(3)                             NULL     DEFAULT NULL,
     KEY `kylin_projects_uid_index` (`projects_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
@@ -396,8 +396,8 @@ CREATE TABLE `kylin_project_relations`
     `tied_price`           decimal(8, 2)                        NOT NULL DEFAULT '0.00' COMMENT '搭售价格',
     `is_limit`             tinyint(4)                           NOT NULL DEFAULT '0' COMMENT '是否限购',
     `limit_num`            int(11)                              NOT NULL DEFAULT '0' COMMENT '限购数量 0不限购',
-    `created_at`           datetime                             NULL     DEFAULT NULL,
-    `updated_at`           datetime                             NULL     DEFAULT NULL,
+    `created_at`           datetime(3)                             NULL     DEFAULT NULL,
+    `updated_at`           datetime(3)                             NULL     DEFAULT NULL,
     PRIMARY KEY (`mid`),
     KEY `kylin_project_relations_uid_index` (`project_relations_id`),
     KEY `kylin_project_relations_project_id_index` (`project_id`),
@@ -443,8 +443,8 @@ CREATE TABLE `kylin_order_tickets`
     `get_ticket_describe`  varchar(255)     NOT NULL DEFAULT '' COMMENT '直播用取票观演码，隔开',
     `pay_countdown_minute` int(32)          NOT NULL DEFAULT 15 COMMENT '订单过期时间(分钟)',
     `comment`              varchar(255)     NULL     DEFAULT '' COMMENT 'comment',
-    `created_at`           datetime         NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`           datetime         NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`           datetime(3)         NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`           datetime(3)         NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_order_tickets_uid_index` (`order_tickets_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
@@ -463,8 +463,8 @@ CREATE TABLE `kylin_order_ticket_relations`
     `ticket_id`                 varchar(255)     NOT NULL DEFAULT '' COMMENT '票id',
     `agent_id`                  varchar(255)     NOT NULL DEFAULT '' COMMENT '分销代理id',
     `is_member`                 int              NOT NULL DEFAULT 0 COMMENT '购买者是否是会员',
-    `created_at`                datetime         NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`                datetime         NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`                datetime(3)         NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`                datetime(3)         NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_order_ticket_relations_uid_index` (`order_ticket_relations_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
@@ -481,8 +481,8 @@ CREATE TABLE `kylin_order_ticket_status`
     `transfer_status`        tinyint          NOT NULL DEFAULT 0 COMMENT '转移状态，0未转移，1收到他人转赠，2已转赠给他人',
     `status`                 tinyint          NOT NULL DEFAULT 0 COMMENT '订单状态:0待付款，1已付款，2已关闭，3正在退款，4已退款, 5待关闭 6部分退款',
     `pay_status`             tinyint          NOT NULL DEFAULT 0 COMMENT '支付状态:0未支付 1已支付 2支付失败',
-    `created_at`             datetime         NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`             datetime         NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`             datetime(3)         NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`             datetime(3)         NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_order_ticket_status_uid_index` (`order_ticket_status_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
@@ -509,8 +509,8 @@ CREATE TABLE `kylin_order_ticket_entities`
     `check_client`             varchar(255)     NOT NULL DEFAULT '' COMMENT '出票端 例如 pda 验票app android/ios 大麦出票',
     `is_payment`               int(11)          NOT NULL DEFAULT 0 COMMENT '支付状态: 0未支付 1已支付 2退款中 3已退款 ',
     `comment`                  varchar(255)     NULL     DEFAULT '' COMMENT 'comment',
-    `created_at`               datetime         NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`               datetime         NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`               datetime(3)         NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`               datetime(3)         NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_order_ticket_entities_uid_index` (`order_ticket_entities_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
@@ -527,8 +527,8 @@ CREATE TABLE `kylin_buy_notice`
     `message`       varchar(255)     NOT NULL DEFAULT '' COMMENT '内容',
     `status`        tinyint          NOT NULL DEFAULT 1 COMMENT '状态 1可用 0弃用',
     `sort`          int(10)          NOT NULL DEFAULT 0 COMMENT '排序 大在上',
-    `created_at`    datetime         NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`    datetime         NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`    datetime(3)         NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`    datetime(3)         NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_buy_notice_uid_index` (`buy_notice_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
@@ -545,8 +545,8 @@ CREATE TABLE `kylin_check_user`
     `pwd`           varchar(255)     NOT NULL DEFAULT '' COMMENT '密码',
     `status`        tinyint          NOT NULL DEFAULT 1 COMMENT '是否可用 0否 1是',
     `merchant_id`   varchar(255)     NOT NULL DEFAULT '' COMMENT 'merchantId 第三方id',
-    `created_at`    datetime         NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`    datetime         NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`    datetime(3)         NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`    datetime(3)         NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_check_user_uid_index` (`check_user_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB
@@ -562,8 +562,8 @@ CREATE TABLE `kylin_check_user_performances`
     `check_user_id`             varchar(255)     NOT NULL DEFAULT '' COMMENT 'check_user_id',
     `status`                    tinyint          NOT NULL DEFAULT 1 COMMENT '状态 1可用 0不可',
     `can_down_time`             datetime         NULL     DEFAULT NULL COMMENT '可下载时间',
-    `created_at`                datetime         NULL     DEFAULT NULL COMMENT '创建时间',
-    `updated_at`                datetime         NULL     DEFAULT NULL COMMENT '修改时间',
+    `created_at`                datetime(3)         NULL     DEFAULT NULL COMMENT '创建时间',
+    `updated_at`                datetime(3)         NULL     DEFAULT NULL COMMENT '修改时间',
     KEY `kylin_check_user_uid_index` (`check_user_id`),
     PRIMARY KEY (`mid`)
 ) ENGINE = InnoDB

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

@@ -36,7 +36,7 @@ public class KylinLackRegistersServiceImpl extends ServiceImpl<KylinLackRegister
             lackRegisters.setUserMobile(StringUtils.defaultString(((String) token.get("mobile")), ""));
             lackRegisters.setIpAddress(CurrentUtil.getCliIpAddr());
             lackRegisters.setCreatedAt(LocalDateTime.now());
-            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_PERFORMANCE_LACK, MQConst.ROUTING_KEY_SQL_PERFORMANCE_LACK,
+            rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL_PERFORMANCE_LACK, MQConst.ROUTING_KEY_SQL_PERFORMANCE_LACK,
                     SqlMapping.get("kylin_lack_register.insert", lackRegisters.getInsertObj()));
             return ResponseDto.success("登记成功");
         }catch (Exception e){

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

@@ -86,7 +86,7 @@ public class KylinOrderTicketEntitiesServiceImpl extends ServiceImpl<KylinOrderT
 
 
         // TODO: 2021/6/1 sql to mq
-//        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+//        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
 //                SqlMapping.get("kylin_order_ticket_entities.updateStatusByStation", paramsList));
     }
 }

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

@@ -32,12 +32,15 @@ import com.liquidnet.service.kylin.service.IKylinOrderTicketsService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.service.kylin.utils.*;
 import com.mongodb.BasicDBObject;
+import com.mongodb.client.model.FindOneAndUpdateOptions;
+import com.mongodb.client.model.ReturnDocument;
 import com.taobao.api.TaobaoClient;
 import com.taobao.api.request.AlibabaDamaiMevOpenBatchpushticketRequest;
 import com.taobao.api.response.AlibabaDamaiMevOpenBatchpushticketResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.time.DateUtils;
-import org.apache.commons.lang3.StringUtils;
+import org.bson.Document;
 import org.redisson.api.RLock;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.BeanUtils;
@@ -56,7 +59,6 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
-import static com.liquidnet.commons.lang.util.DateUtil.Formatter.yyyyMMdd;
 
 /**
  * <p>
@@ -286,6 +288,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         LinkedList<String> sqls = new LinkedList<>();
         String source = CurrentUtil.getCliSource() == null ? "" : CurrentUtil.getCliSource();
         String version = CurrentUtil.getCliVersion() == null ? "" : CurrentUtil.getCliVersion();
+        LocalDateTime now = LocalDateTime.now();
         //生成订单 order_ticket
         KylinOrderTickets orderTickets = new KylinOrderTickets();
         String orderTicketId = IDGenerator.nextSnowId().toString();
@@ -339,7 +342,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         orderTickets.setCouponType("no");
         orderTickets.setGetTicketDescribe("");
         orderTickets.setPayCountdownMinute(performanceData.getPayCountdownMinute());
-        orderTickets.setCreatedAt(LocalDateTime.now());
+        orderTickets.setCreatedAt(now);
         orderTickets.setUpdatedAt(null);
 
 
@@ -353,7 +356,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         orderTicketStatus.setStatus(KylinTableStatusConst.ORDER_STATUS0);
         orderTicketStatus.setIsStudent(isStudent);
         orderTicketStatus.setPayStatus(KylinTableStatusConst.ORDER_PAY_STATUS0);
-        orderTicketStatus.setCreatedAt(LocalDateTime.now());
+        orderTicketStatus.setCreatedAt(now);
         orderTicketStatus.setUpdatedAt(null);
         sqls.add(SqlMapping.get("kylin_order_ticket_status.add"));
         LinkedList<Object[]> sqlsDataB = new LinkedList<Object[]>();
@@ -371,7 +374,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         orderTicketRelations.setPerformanceId(payOrderParam.getPerformanceId());
         orderTicketRelations.setTimeId(payOrderParam.getTimeId());
         orderTicketRelations.setTicketId(payOrderParam.getTicketId());
-        orderTicketRelations.setCreatedAt(LocalDateTime.now());
+        orderTicketRelations.setCreatedAt(now);
         orderTicketRelations.setUpdatedAt(null);
         sqls.add(SqlMapping.get("kylin_order_ticket_relation.add"));
         LinkedList<Object[]> sqlsDataC = new LinkedList<Object[]>();
@@ -400,7 +403,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 orderTicketEntities.setCheckClient("");
                 orderTicketEntities.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT0);
                 orderTicketEntities.setComment("");
-                orderTicketEntities.setCreatedAt(LocalDateTime.now());
+                orderTicketEntities.setCreatedAt(now);
                 orderTicketEntities.setUpdatedAt(null);
                 sqls.add(SqlMapping.get("kylin_order_ticket_entities.add"));
                 sqlsDataD.add(orderTicketEntities.getAddObject());
@@ -415,6 +418,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 orderTicketEntitiesVo.setTimemId(ticketTimesData.getMid());
                 orderTicketEntitiesVo.setCreatedAt(orderTicketEntities.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 orderTicketEntitiesVo.setUpdatedAt(null);
+                orderTicketEntitiesVo.setChangeDate(orderTicketEntities.getCreatedAt());
                 mongoTemplate.insert(orderTicketEntitiesVo, KylinOrderTicketEntitiesVo.class.getSimpleName());
                 dataUtils.changeBuyInfo(orderTicketEntitiesVo.getUserId(), orderTicketEntitiesVo.getEnterIdCode(), orderTicketEntitiesVo.getPerformanceId(), orderTicketEntitiesVo.getTicketId(), 1);
             }
@@ -435,7 +439,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 orderTicketEntities.setCheckClient("");
                 orderTicketEntities.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT0);
                 orderTicketEntities.setComment("");
-                orderTicketEntities.setCreatedAt(LocalDateTime.now());
+                orderTicketEntities.setCreatedAt(now);
                 orderTicketEntities.setUpdatedAt(null);
                 sqls.add(SqlMapping.get("kylin_order_ticket_entities.add"));
                 sqlsDataD.add(orderTicketEntities.getAddObject());
@@ -450,6 +454,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 orderTicketEntitiesVo.setTimemId(ticketTimesData.getMid());
                 orderTicketEntitiesVo.setCreatedAt(orderTicketEntities.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
                 orderTicketEntitiesVo.setUpdatedAt(null);
+                orderTicketEntitiesVo.setChangeDate(orderTicketEntities.getCreatedAt());
                 mongoTemplate.insert(orderTicketEntitiesVo, KylinOrderTicketEntitiesVo.class.getSimpleName());
                 dataUtils.changeBuyInfo(orderTicketEntitiesVo.getUserId(), orderTicketEntitiesVo.getEnterIdCode(), orderTicketEntitiesVo.getPerformanceId(), orderTicketEntitiesVo.getTicketId(), 1);
             }
@@ -489,7 +494,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         payResultVo.setPrice(orderTickets.getPriceActual());
         orderTickets.setPayCode(payResultVo.getCode());
         sqls.add(SqlMapping.get("kylin_order_ticket.add"));
-        LinkedList<Object[]> sqlsDataA = new LinkedList<Object[]>();
+        LinkedList<Object[]> sqlsDataA = new LinkedList<>();
         sqlsDataA.add(orderTickets.getAddObject());
 
         if (payOrderParam.getPayType().equals("alipay") && payOrderParam.getDeviceFrom().equals("wap")) {
@@ -507,13 +512,14 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         orderTicketVo.setTimeStart(performanceData.getTimeStart());
         orderTicketVo.setOverdueAt(orderTickets.getCreatedAt().plusMinutes(performanceData.getPayCountdownMinute()).plusSeconds(15).format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
         orderTicketVo.setCreatedAt(orderTickets.getCreatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        orderTicketVo.setChangeDate(orderTickets.getCreatedAt());
         mongoTemplate.insert(orderTicketVo, KylinOrderTicketVo.class.getSimpleName());
 
         mongoVoUtils.resetOrderListVo(uid, 1, orderTicketVo.getOrderTicketsId());
 
         // 执行sql
         String sqlData = SqlMapping.gets(sqls, sqlsDataB, sqlsDataC, sqlsDataD, sqlsDataA);
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
+        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CREADE, MQConst.ROUTING_KEY_SQL_ORDER_CREATE,
                 sqlData);
         return ResponseDto.success(payResultVo);
     }
@@ -586,18 +592,34 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                 orderTickets.setPayType(payAgainParam.getPayType());
 
                 //改vo
-                HashMap<String, String> map = new HashMap<>();
+                HashMap<String, Object> map = new HashMap<>();
                 map.put("payType", payAgainParam.getPayType());
                 map.put("payCode", payResultVo.getCode());
-                map.put("updatedAt", orderTickets.getUpdatedAt().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
+                map.put("updatedAt", DateUtil.Formatter.yyyyMMddHHmmss.format(orderTickets.getUpdatedAt()));
+                map.put("changeDate", orderTickets.getUpdatedAt());
+                Document doc = mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).findOneAndUpdate(
                         Query.query(Criteria.where("orderTicketsId").is(payAgainParam.getOrderId())).getQueryObject(),
-                        new BasicDBObject("$set", mongoConverter.convertToMongoType(map))
+                        new BasicDBObject("$set", mongoConverter.convertToMongoType(map)),
+                        new FindOneAndUpdateOptions().returnDocument(ReturnDocument.BEFORE)
                 );
+
+                KylinOrderTicketVo orderTicketVo = BsonUtil.toBean(doc, KylinOrderTicketVo.class);
+                LocalDateTime strTime = orderTicketVo.getChangeDate();
                 dataUtils.delOrderTicketRedis(orderTickets.getOrderTicketsId());
 
-                rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-                        SqlMapping.get("kylin_order_ticket.payAgain", orderTickets.getPayAgainObject()));
+                LinkedList<String> sqls = new LinkedList<>();
+                sqls.add(SqlMapping.get("kylin_order_ticket.payAgain"));
+                LinkedList<Object[]> sqlsDataA = new LinkedList<>();
+                sqlsDataA.add(orderTickets.getPayAgainObject(strTime, strTime));
+                sqls.add(SqlMapping.get("kylin_order_ticket_status.payAgain"));
+                LinkedList<Object[]> sqlsDataB = new LinkedList<>();
+                sqlsDataB.add(new Object[]{orderTickets.getUpdatedAt(),orderTickets.getOrderTicketsId(),strTime, strTime});
+                sqls.add(SqlMapping.get("kylin_order_ticket_relation.payAgain"));
+                LinkedList<Object[]> sqlsDataC = new LinkedList<>();
+                sqlsDataC.add(new Object[]{orderTickets.getUpdatedAt(),orderTickets.getOrderTicketsId(),strTime, strTime});
+
+                String sqlData = SqlMapping.gets(sqls, sqlsDataA,sqlsDataB, sqlsDataC);
+                rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_AGAIN, MQConst.ROUTING_KEY_SQL_ORDER_AGAIN,sqlData);
                 return ResponseDto.success(payResultVo);
             }
             return ResponseDto.failure("未选择支付方式");
@@ -644,6 +666,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         }
 
         LinkedList<String> sqls = new LinkedList<>();
+        LocalDateTime strTime = orderTicketData.getChangeDate();
 
         //sql
         KylinOrderTickets orderTickets = new KylinOrderTickets();
@@ -654,8 +677,8 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         orderTickets.setQrCode(IDGenerator.ticketQrCode(orderTicketData.getOrderTicketsId()));
         orderTickets.setUpdatedAt(now);
         sqls.add(SqlMapping.get("kylin_order_ticket.synPay"));
-        LinkedList<Object[]> sqlsDataA = new LinkedList<Object[]>();
-        sqlsDataA.add(orderTickets.getSynOrderObject());
+        LinkedList<Object[]> sqlsDataA = new LinkedList<>();
+        sqlsDataA.add(orderTickets.getSynOrderObject(strTime, strTime));
 
         KylinOrderTicketStatus orderTicketStatus = new KylinOrderTicketStatus();
         orderTicketStatus.setOrderId(orderTicketData.getOrderTicketsId());
@@ -663,16 +686,20 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         orderTicketStatus.setPayStatus(syncOrderParam.getStatus());
         orderTicketStatus.setUpdatedAt(orderTickets.getUpdatedAt());
         sqls.add(SqlMapping.get("kylin_order_ticket_status.synPay"));
-        LinkedList<Object[]> sqlsDataB = new LinkedList<Object[]>();
-        sqlsDataB.add(orderTicketStatus.getSynOrderObject());
+        LinkedList<Object[]> sqlsDataB = new LinkedList<>();
+        sqlsDataB.add(orderTicketStatus.getSynOrderObject(strTime, strTime));
+
+        sqls.add(SqlMapping.get("kylin_order_ticket_relation.synPay"));
+        LinkedList<Object[]> sqlsDataC = new LinkedList<>();
+        sqlsDataC.add(new Object[]{orderTickets.getUpdatedAt(),orderTickets.getOrderTicketsId(),strTime, strTime});
 
         KylinOrderTicketEntities orderTicketEntities = new KylinOrderTicketEntities();
         orderTicketEntities.setOrderId(orderTicketData.getOrderTicketsId());
         orderTicketEntities.setIsPayment(KylinTableStatusConst.ENTITIES_IS_PAYMENT1);
         orderTicketEntities.setUpdatedAt(orderTickets.getUpdatedAt());
         sqls.add(SqlMapping.get("kylin_order_ticket_entities.synPay"));
-        LinkedList<Object[]> sqlsDataC = new LinkedList<Object[]>();
-        sqlsDataC.add(orderTicketEntities.getSynOrderObject());
+        LinkedList<Object[]> sqlsDataD = new LinkedList<>();
+        sqlsDataD.add(orderTicketEntities.getSynOrderObject(strTime, strTime));
 
 
         //vo
@@ -684,6 +711,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         orderTicketVo.put("status", KylinTableStatusConst.ORDER_STATUS1);
         orderTicketVo.put("payStatus", orderTicketStatus.getStatus());
         orderTicketVo.put("updatedAt", timePay);
+        orderTicketVo.put("changeDate", now);
         mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
                 Query.query(Criteria.where("orderTicketsId").is(orderTickets.getOrderTicketsId())).getQueryObject(),
                 new BasicDBObject("$set", mongoConverter.convertToMongoType(orderTicketVo))
@@ -693,14 +721,15 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
         HashMap<String, Object> orderTicketEntitiesVo = new HashMap<>();
         orderTicketEntitiesVo.put("isPayment", KylinTableStatusConst.ENTITIES_IS_PAYMENT1);
         orderTicketEntitiesVo.put("updatedAt", timePay);
+        orderTicketEntitiesVo.put("changeDate", now);
         mongoTemplate.getCollection(KylinOrderTicketEntitiesVo.class.getSimpleName()).updateMany(
                 Query.query(Criteria.where("orderId").is(orderTickets.getOrderTicketsId())).getQueryObject(),
                 new BasicDBObject("$set", mongoConverter.convertToMongoType(orderTicketEntitiesVo))
         );
         dataUtils.delOrderTicketRedis(orderTickets.getOrderTicketsId());
 
-        rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL,
-                SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC));
+        rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY, MQConst.ROUTING_KEY_SQL_ORDER_PAY,
+                SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC,sqlsDataD));
 
         //生成vo redis
         mongoVoUtils.resetOrderListVo(orderTicketData.getUserId(), 2, orderTicketData.getOrderTicketsId());
@@ -800,6 +829,34 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 //                Expresses expresses = expressesMapper.selectOne(new UpdateWrapper<Expresses>().eq("order_id", orderId).eq("order_type", "order_ticket"));
                 KylinPerformanceVo performanceVo = dataUtils.getPerformanceVo(orderTicketVo.getPerformanceId());
                 List<KylinOrderTicketEntitiesVo> kylinOrderTicketEntitiesVoList = orderTicketVo.getEntitiesVoList();
+                KylinTicketVo ticketVo = null;
+
+                //获取购票数据
+                for (int x = 0; x < performanceVo.getTicketTimeList().size(); x++) {
+                    KylinTicketTimesVo timeItem = performanceVo.getTicketTimeList().get(x);
+                    for (int y = 0; y < timeItem.getTicketList().size(); y++) {
+                        KylinTicketVo ticketItem = timeItem.getTicketList().get(y);
+                        if (ticketItem.getTicketsId().equals(orderTicketVo.getTicketId())) {
+                            ticketVo = ticketItem;
+                            break;
+                        }
+                    }
+                }
+
+                orderTicketVo.setIsTrueName(ticketVo.getIsTrueName());
+                orderTicketVo.setNoticeImage(performanceVo.getNoticeImage());
+                orderTicketVo.setTicketType(ticketVo.getType());
+                orderTicketVo.setFieldName(performanceVo.getFieldName());
+                if (ticketVo.getIsShowCode() == 1) {
+                    Date date = DateUtil.parse(ticketVo.getQrCodeShowTime(), DateUtil.Formatter.yyyyMMddHHmm.toString());
+                    if (DateUtil.compareDay(date, DateUtil.now()) > 0) {
+                        orderTicketVo.setQrCode("");
+                    }
+                } else {
+                    orderTicketVo.setQrCode("");
+                }
+
+
                 // 数据脱敏
                 for (KylinOrderTicketEntitiesVo item : kylinOrderTicketEntitiesVoList) {
                     if (item.getEnterIdCode().length() == 18) {
@@ -828,8 +885,6 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     vo.setExpress_company("");
                     vo.setKuaidi_status(-2);
                 }
-                vo.setOrderTicketEntitiesVo(kylinOrderTicketEntitiesVoList);
-                vo.setPerformanceVo(performanceVo);
                 vo.setOrderTicketVo(orderTicketVo);
             }
             return vo;
@@ -851,6 +906,15 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             if (item.getStatus() == KylinTableStatusConst.ORDER_STATUS0) {
                 LocalDateTime now = LocalDateTime.now();
                 try {
+
+                    KylinOrderTicketVo vo = mongoTemplate.findOne(
+                            Query.query(Criteria.where("orderTicketsId").is(item.getOrderTicketsId())),
+                            KylinOrderTicketVo.class,
+                            KylinOrderTicketVo.class.getSimpleName());
+                    if(vo.getStatus()!=0){
+                        continue;
+                    }
+
                     //mysql
                     KylinOrderTickets orderTickets = new KylinOrderTickets();
                     orderTickets.setOrderTicketsId(item.getOrderTicketsId());
@@ -864,11 +928,17 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
                     //vo
                     HashMap<String, Object> map = new HashMap<>();
                     map.put("status", KylinTableStatusConst.ORDER_STATUS2);
-                    map.put("updatedAt", now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
-                    mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).updateOne(
+                    map.put("updatedAt", DateUtil.Formatter.yyyyMMddHHmmssSSS.format(now));
+                    map.put("changeDate", now);
+                    Document doc = mongoTemplate.getCollection(KylinOrderTicketVo.class.getSimpleName()).findOneAndUpdate(
                             Query.query(Criteria.where("orderTicketsId").is(orderTickets.getOrderTicketsId())).getQueryObject(),
-                            new BasicDBObject("$set", mongoConverter.convertToMongoType(map))
+                            new BasicDBObject("$set", mongoConverter.convertToMongoType(map)),
+                            new FindOneAndUpdateOptions().returnDocument(ReturnDocument.BEFORE)
                     );
+
+                    KylinOrderTicketVo orderTicketVo = BsonUtil.toBean(doc, KylinOrderTicketVo.class);
+                    LocalDateTime strTime = orderTicketVo.getChangeDate();
+
                     dataUtils.delOrderTicketRedis(orderTickets.getOrderTicketsId());
                     dataUtils.changeSurplusGeneral(item.getTicketId(), item.getNumber());
                     mongoVoUtils.resetOrderListVo(item.getUserId(), 2, item.getOrderTicketsId());
@@ -881,13 +951,17 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
 
                     sqls.add(SqlMapping.get("kylin_order_ticket.close"));
                     LinkedList<Object[]> sqlsDataA = new LinkedList<>();
-                    sqlsDataA.add(orderTickets.getCloseOrderObject());
+                    sqlsDataA.add(orderTickets.getCloseOrderObject(strTime, strTime));
 
                     sqls.add(SqlMapping.get("kylin_order_ticket_status.close"));
                     LinkedList<Object[]> sqlsDataB = new LinkedList<>();
-                    sqlsDataA.add(orderTickets.getCloseOrderObject());
+                    sqlsDataB.add(orderTicketStatus.getCloseOrderObject(strTime, strTime));
+
+                    sqls.add(SqlMapping.get("kylin_order_ticket_relation.close"));
+                    LinkedList<Object[]> sqlsDataC = new LinkedList<>();
+                    sqlsDataC.add(new Object[]{orderTickets.getUpdatedAt(),orderTickets.getOrderTicketsId(),strTime, strTime});
 
-                    rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL, MQConst.ROUTING_KEY_SQL, SqlMapping.gets(sqls, sqlsDataA, sqlsDataB));
+                    rabbitTemplate.convertSendAndReceive(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_CLOSE, MQConst.ROUTING_KEY_SQL_ORDER_CLOSE, SqlMapping.gets(sqls, sqlsDataA, sqlsDataB,sqlsDataC));
 
                 } catch (Exception e) {
 //                    lock.unlock();

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/resources/sqlmap.properties

@@ -10,14 +10,22 @@ kylin_order_ticket_status.add=INSERT INTO kylin_order_ticket_status(order_ticket
 kylin_order_ticket_entities.add=INSERT INTO kylin_order_ticket_entities(order_ticket_entities_id ,order_id ,ticket_id ,user_id ,time_id ,performance_id ,enter_type ,enter_name ,enter_mobile,enter_id_code,`status`,sys_damai,check_client,is_payment,`comment`,created_at,updated_at)VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 
 # ------------------------再次支付----------------------------
-kylin_order_ticket.payAgain=UPDATE  kylin_order_tickets SET order_type = ? ,order_code = ? , updated_at = ?  WHERE order_tickets_id = ?
+kylin_order_ticket.payAgain=UPDATE kylin_order_tickets SET order_type = ? ,order_code = ? , updated_at = ?  WHERE order_tickets_id = ? and (updated_at = ? or created_at = ?)
+kylin_order_ticket_status.payAgain=UPDATE kylin_order_ticket_status SET updated_at = ?  WHERE order_id = ? and (updated_at = ? or created_at = ?)
+kylin_order_ticket_relation.payAgain=UPDATE kylin_order_ticket_relations SET updated_at = ?  WHERE order_id = ? and (updated_at = ? or created_at = ?)
+
 
 # ------------------------支付回调----------------------------
-kylin_order_ticket.synPay=UPDATE  kylin_order_tickets SET payment_type = ? ,pay_code = ? , time_pay = ?, qr_code = ? , updated_at = ? WHERE order_tickets_id = ?
-kylin_order_ticket_entities.synPay=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? 
-kylin_order_ticket_status.synPay=UPDATE kylin_order_ticket_status SET `status` = ?,pay_status = ?,updated_at = ? WHERE order_id = ? 
+kylin_order_ticket.synPay=UPDATE  kylin_order_tickets SET payment_type = ? ,pay_code = ? , time_pay = ?, qr_code = ? , updated_at = ? WHERE order_tickets_id = ? and (updated_at = ? or created_at = ?)
+kylin_order_ticket_status.synPay=UPDATE kylin_order_ticket_status SET `status` = ?,pay_status = ?,updated_at = ? WHERE order_id = ? and (updated_at = ? or created_at = ?)
+kylin_order_ticket_relation.synPay=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ? and (updated_at = ? or created_at = ?)
+kylin_order_ticket_entities.synPay=UPDATE kylin_order_ticket_entities SET is_payment = ?,updated_at = ?,sys_damai = 1 WHERE order_id = ? and (updated_at = ? or created_at = ?)
+
+
 
 # ------------------------订单关闭----------------------------
-kylin_order_ticket.close=UPDATE  kylin_order_tickets SET updated_at = ? WHERE order_tickets_id = ? 
-kylin_order_ticket_status.close=UPDATE kylin_order_ticket_status SET `status` = ?,updated_at = ? WHERE order_id = ? 
+kylin_order_ticket.close=UPDATE kylin_order_tickets SET updated_at = ? WHERE order_tickets_id = ? and (updated_at = ? or created_at = ?)
+kylin_order_ticket_status.close=UPDATE kylin_order_ticket_status SET `status` = ?,updated_at = ? WHERE order_id = ? and (updated_at = ? or created_at = ?)
+kylin_order_ticket_relation.close=UPDATE kylin_order_ticket_relations SET updated_at = ? WHERE order_id = ? and (updated_at = ? or created_at = ?)
+