Merge branch 'test'

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsOrderService.java

+package com.liquidnet.service.kylin.service;
+
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.param.PayAgainParam;
+import com.liquidnet.service.kylin.dto.param.PayOrderParam;
+import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
+import com.liquidnet.service.kylin.dto.vo.returns.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 订单 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-20
+ */
+public interface IKylinOrderTicketsOrderService {
+
+    // 下单前判断接口(判断是否可锁定库存)(无订单->待支付->可支付)
+    ResponseDto<PayResultVo> checkCanOrder(PayOrderParam payOrderParam);
+
+    // 再次支付(待支付->可支付->倒计时结束释放库存)
+    ResponseDto<PayResultVo> payAgain(PayAgainParam payAgainParam);
+
+    // 支付回调(待支付->已支付->中断倒计时)
+    String syncOrder(SyncOrderParam syncOrderParam);
+
+    //去 PHP pay检查 订单状态
+    ResponseDto<Integer> checkOrderResult(String orderId);
+
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsService.java

@@ -22,26 +22,12 @@ import java.util.List;
  */
 public interface IKylinOrderTicketsService  {
 
-    // 下单前判断接口(判断是否可锁定库存)(无订单->待支付->可支付)
-    ResponseDto<PayResultVo> checkCanOrder(PayOrderParam payOrderParam);
-
-    // 再次支付(待支付->可支付->倒计时结束释放库存)
-    ResponseDto<PayResultVo> payAgain(PayAgainParam payAgainParam);
-
-    // 支付回调(待支付->已支付->中断倒计时)
-    String syncOrder(SyncOrderParam syncOrderParam);
-
-    // 同步大麦数据接口
-
     //订单列表(状态 待支付 已支付 倒计时 已失效)
     PageInfo<List<KylinOrderListVo>> orderList();
 
     //订单详情
     OrderDetailsVo orderDetails(String orderId);
 
-    //去 PHP pay检查 订单状态
-    ResponseDto<Integer> checkOrderResult(String orderId);
-
     //订单未支付数量
     ResponseDto<Integer> orderUnPayCount();
 
@@ -63,15 +49,4 @@ public interface IKylinOrderTicketsService  {
 
     //退款撤回
     ResponseDto<Boolean> orderRefundWithdraw(String orderRefundsId);
-
-    //退款再次申请
-    Boolean orderRefundAgain(String orderRefundsId);
-
-
-    // 下单接口(无订单->待支付->可支付)
-    // 删除订单
-    // 代理票务 可买状态判断
-    // 取消支付(待支付->订单失效->释放库存->中断倒计时)
-    // ResponseDto<PayResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData,Object adamEntersList);
-
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/pom.xml

@@ -96,6 +96,21 @@
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-client-admin-generator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/banners.html

@@ -25,7 +25,7 @@
                             <label>是否上线：</label>
                             <select name="isOnline">
                                 <option value="">全部</option>
-                                <option value="0">下线</option>
+                                <option value="88">下线</option>
                                 <option value="1">上线</option>
                             </select>
                         </li>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/test/java/com.liquidnet.client.admin/TestLocal.java

+package com.liquidnet.client.admin;
+
+import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
+import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
+import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
+import com.mongodb.BasicDBObject;
+import com.mongodb.client.result.UpdateResult;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+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.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.time.LocalDateTime;
+
+/**
+ * Test
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest
+public class TestLocal {
+    @Autowired
+    private MongoTemplate mongoTemplate;
+
+    @Autowired
+    MongoConverter mongoConverter;
+
+    @Test
+    public void updateAt(){
+        KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
+        kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY);
+        kylinOrderRefunds.setApplicantId("1111");
+        kylinOrderRefunds.setApplicantName("2222");
+        kylinOrderRefunds.setApplicantAt(LocalDateTime.now());
+        KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();
+        BeanUtils.copyProperties(kylinOrderRefunds, kylinOrderRefundsVo);
+        kylinOrderRefundsVo.setUpdatedAt(LocalDateTime.now());
+        BasicDBObject EntitiesVov = new BasicDBObject("$set", mongoConverter.convertToMongoType(kylinOrderRefundsVo));
+
+        UpdateResult updateResult = mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
+                Query.query(Criteria.where("orderRefundsId").in("2767295925071872949890")).getQueryObject(),
+                EntitiesVov
+        );
+    }
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinBannersServiceImpl.java

@@ -38,6 +38,7 @@ import org.springframework.util.StringUtils;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -244,15 +245,6 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
         return pageInfoTmp;
     }
 
-    public Long bannerListCount(BannersSearchParam bannersSearchParam) {
-        try {
-            Long count = bannersMapper.searchBannersCount(BeanUtil.convertBeanToMap(bannersSearchParam));
-            return count;
-        } catch (Exception e) {
-            return 0L;
-        }
-    }
-
     public Boolean delete(List<String> bannersId) {
         try {
             LocalDateTime updatedAt = LocalDateTime.now();

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundsStatusServiceImpl.java

@@ -37,6 +37,7 @@ import org.springframework.util.MultiValueMap;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -309,6 +310,15 @@ public class KylinRefundsStatusServiceImpl {
             );
 
         }
+        List<String> orderRefundIds = refundList.stream().map(
+                KylinOrderRefunds -> KylinOrderRefunds.getOrderRefundsId()).collect(Collectors.toList()
+        );
+        List<String> orderIds = refundList.stream().map(
+                KylinOrderRefunds -> KylinOrderRefunds.getOrderTicketsId()).collect(Collectors.toList()
+        );
+        dataUtils.delOrderRefundVo(orderRefundIds);
+        dataUtils.delOrderRefundVoByOrderId(orderIds);
+
         return true;
     }
 
@@ -351,6 +361,9 @@ public class KylinRefundsStatusServiceImpl {
         List<String> orderRefundIds = refundList.stream().map(
                 KylinOrderRefunds -> KylinOrderRefunds.getOrderRefundsId()).collect(Collectors.toList()
         );
+        List<String> orderIds = refundList.stream().map(
+                KylinOrderRefunds -> KylinOrderRefunds.getOrderTicketsId()).collect(Collectors.toList()
+        );
         kylinOrderRefundsMapper.update(
                 kylinOrderRefunds,
                 new UpdateWrapper<KylinOrderRefunds>().in("order_refunds_id", orderRefundIds)
@@ -363,6 +376,8 @@ public class KylinRefundsStatusServiceImpl {
                 Query.query(Criteria.where("orderRefundsId").in(orderRefundIds)).getQueryObject(),
                 object
         );
+        dataUtils.delOrderRefundVo(orderRefundIds);
+        dataUtils.delOrderRefundVoByOrderId(orderIds);
 
         return true;
     }
@@ -416,6 +431,15 @@ public class KylinRefundsStatusServiceImpl {
             );
         }
 
+        List<String> orderRefundIds = refundList.stream().map(
+                KylinOrderRefunds -> KylinOrderRefunds.getOrderRefundsId()).collect(Collectors.toList()
+        );
+        List<String> orderIds = refundList.stream().map(
+                KylinOrderRefunds -> KylinOrderRefunds.getOrderTicketsId()).collect(Collectors.toList()
+        );
+        dataUtils.delOrderRefundVo(orderRefundIds);
+        dataUtils.delOrderRefundVoByOrderId(orderIds);
+
         return true;
     }
 
@@ -549,6 +573,13 @@ public class KylinRefundsStatusServiceImpl {
                 object
         );
 
+        List<String> orderRefundIds = new ArrayList<>();
+        orderRefundIds.add(refundInfo.getOrderRefundsId());
+        List<String> orderIds = new ArrayList<>();
+        orderIds.add(orderTicketsId);
+        dataUtils.delOrderRefundVo(orderRefundIds);
+        dataUtils.delOrderRefundVoByOrderId(orderIds);
+
         if (refundInfo.getType() == KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY) {
             // 退还库存
             for (String entitiesId : orderTicketEntitiesIdsArr) {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/utils/DataUtils.java

@@ -278,4 +278,18 @@ public class DataUtils {
         String redisKey = KylinRedisConst.ORDER_EXPRESS_INFO.concat(orderId);
         redisUtil.del(redisKey);
     }
+
+    /**
+     * 退款redis
+     */
+    public void delOrderRefundVo(List<String> orderRefundIds){
+        for (String id : orderRefundIds) {
+            redisUtil.del(KylinRedisConst.ORDER_REFUND.concat(id));
+        }
+    }
+    public void delOrderRefundVoByOrderId(List<String>  orderIds){
+        for (String id : orderIds) {
+            redisUtil.del(KylinRedisConst.ORDER_REFUND_BY_ORDER_ID.concat(id));
+        }
+    }
 }

liquidnet-bus-common/liquidnet-common-web/src/main/java/com/liquidnet/common/web/config/WebMvcConfig.java

 package com.liquidnet.common.web.config;
 
+import com.liquidnet.common.web.filter.GlobalLogTrackInterceptor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
 @Configuration
 public class WebMvcConfig extends WebMvcConfigurationSupport {
-//    @Autowired
-//    GlobalAuthorityInterceptor globalAuthorityInterceptor;
+    @Autowired
+    GlobalLogTrackInterceptor globalLogTrackInterceptor;
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
@@ -26,11 +29,11 @@ public class WebMvcConfig extends WebMvcConfigurationSupport {
         super.addResourceHandlers(registry);
     }
 
-//    @Override
-//    protected void addInterceptors(InterceptorRegistry registry) {
-//        registry.addInterceptor(globalAuthorityInterceptor).addPathPatterns("/**");
-//        super.addInterceptors(registry);
-//    }
+    @Override
+    protected void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(globalLogTrackInterceptor).addPathPatterns("/**");
+        super.addInterceptors(registry);
+    }
 
 //    @Bean
 //    public FilterRegistrationBean domainCrossFilterBean(){

liquidnet-bus-common/liquidnet-common-web/src/main/java/com/liquidnet/common/web/filter/GlobalAuthorityInterceptor.java

@@ -11,6 +11,7 @@ import io.jsonwebtoken.ExpiredJwtException;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.MDC;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.core.env.Environment;
@@ -38,7 +39,6 @@ public class GlobalAuthorityInterceptor extends HandlerInterceptorAdapter {
     private static final String TOKEN_KICK = "40002";
     private static final String TOKEN_INVALID = "40003";
 
-    private static final String START_TIME = "_startTime";
     private static final String ENV_PROD = "prod";
     private static final String ENV_ACTIVE = "spring.profiles.active";
 
@@ -55,8 +55,6 @@ public class GlobalAuthorityInterceptor extends HandlerInterceptorAdapter {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        request.setAttribute(START_TIME, System.currentTimeMillis());
-
         String authorization = request.getHeader(CurrentUtil.uToken), uri = request.getRequestURI(),
                 responseCode = null, token = null, currentUid = null;
 
@@ -103,15 +101,6 @@ public class GlobalAuthorityInterceptor extends HandlerInterceptorAdapter {
         return false;
     }
 
-    @Override
-    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
-//        if (!StringUtils.equalsIgnoreCase(env.getProperty(ENV_ACTIVE), ENV_PROD)) {
-            Long endTime = System.currentTimeMillis();
-            Long startTime = (Long) request.getAttribute(START_TIME);
-            log.info("[{}]耗时:{}s", request.getRequestURI(), ((endTime - startTime) * 1.000) / 1000);
-//        }
-    }
-
     private void responseHandler(HttpServletResponse response, String responseCode) throws IOException {
         ResponseDto<Object> responseDto = ResponseDto.failure(ErrorMapping.get(responseCode));
         response.setCharacterEncoding(StandardCharsets.UTF_8.name());

liquidnet-bus-common/liquidnet-common-web/src/main/java/com/liquidnet/common/web/filter/GlobalLogTrackInterceptor.java

+package com.liquidnet.common.web.filter;
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+import org.slf4j.MDC;
+import org.springframework.stereotype.Component;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Slf4j
+@Data
+@Component
+public class GlobalLogTrackInterceptor extends HandlerInterceptorAdapter {
+    private static final String LNS_TRANCE_ID = "lnsTranceId";
+
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        String t = MDC.get(LNS_TRANCE_ID);
+        MDC.put(LNS_TRANCE_ID, null == t ? String.valueOf(System.nanoTime()) : t);
+        return true;
+    }
+
+    @Override
+    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+        long e = Long.parseLong(MDC.get(LNS_TRANCE_ID));
+        log.info("[{}]耗时:{}ms", request.getRequestURI(), (System.nanoTime() - e) / 1000000);
+        MDC.clear();
+    }
+}

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

@@ -24,8 +24,8 @@ logging:
     name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
     max-size: ${liquidnet.logfile.file-max-size}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{96}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{96}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: info

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

@@ -18,8 +18,8 @@ logging:
     name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
     max-size: 200MB
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{26}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{26}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: info

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

@@ -18,8 +18,8 @@ logging:
     name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
     max-size: 200MB
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{26}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{26}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: info

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

@@ -24,8 +24,8 @@ logging:
     name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
     max-size: ${liquidnet.logfile.file-max-size}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{96}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{96}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: info

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

@@ -24,8 +24,8 @@ logging:
     name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
     max-size: ${liquidnet.logfile.file-max-size}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{96}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{96}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: info

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

@@ -24,8 +24,8 @@ logging:
     name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}.log
     max-size: ${liquidnet.logfile.file-max-size}
   pattern:
-    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
-    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} [ %-5level] %thread [%logger{96}:%line] - %msg%n'
+    file: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{96}:%line] - %msg%n'
+    console: '%d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %X{lnsTranceId} [%logger{96}:%line] - %msg%n'
     rolling-file-name: ${liquidnet.logfile.path}/${liquidnet.logfile.name}-%d{yyyy-MM-dd}.%i.log
   level:
     root: info

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinBannersMapper.java

@@ -4,6 +4,7 @@ import com.liquidnet.service.kylin.dao.BannerDetailsDao;
 import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
 import com.liquidnet.service.kylin.entity.KylinBanners;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -21,6 +22,4 @@ public interface KylinBannersMapper extends BaseMapper<KylinBanners> {
     BannerDetailsDao detail(String bannersId);
     //列表
     List<BannerDetailsListDao> searchBannersList(Map<String,Object> map);
-    //分页数量
-    long searchBannersCount(Map<String,Object> map);
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinBannersMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.liquidnet.service.kylin.mapper.KylinBannersMapper">
-    <select id="detail" parameterType="java.lang.String">
+    <select id="detail" parameterType="java.lang.String" resultType="com.liquidnet.service.kylin.dao.BannerDetailsDao">
         SELECT
         *
         FROM kylin_banners
@@ -22,9 +22,12 @@
             <if test="targetType != ''">
                 AND target_type=${targetType}
             </if>
-            <if test="isOnline != ''">
+            <if test="isOnline != '' and isOnline != 88 ">
                 AND is_online=${isOnline}
             </if>
+            <if test="isOnline == 88 ">
+                AND is_online=0
+            </if>
             <if test="promotionType != ''">
                 AND promotion_type=${promotionType}
             </if>
@@ -32,25 +35,4 @@
         ORDER BY banners_sort DESC
     </select>
 
-    <!-- admin banner列表数量 -->
-    <select id="searchBannersCount" parameterType="java.util.Map" resultType="long">
-        SELECT COUNT(0)
-        FROM kylin_banners
-        <where>
-            is_deleted = 1
-            <if test="bannersName != ''">
-                AND banners_name LIKE concat('%', #{bannersName}, '%')
-            </if>
-            <if test="targetType != ''">
-                AND target_type=#{targetType}
-            </if>
-            <if test="isOnline != ''">
-                AND is_online=#{isOnline}
-            </if>
-            <if test="promotionType != ''">
-                AND promotion_type=#{promotionType}
-            </if>
-        </where>
-    </select>
-
 </mapper>

liquidnet-bus-service/liquidnet-service-consumer-adam/src/main/java/com/liquidnet/service/consumer/service/processor/ConsumerAdamProcessor.java → liquidnet-bus-service/liquidnet-service-consumer-adam/src/main/java/com/liquidnet/service/consumer/service/processor/ConsumerAdamUCenterProcessor.java

@@ -25,7 +25,7 @@ import java.io.IOException;
  */
 @Slf4j
 @Component
-public class ConsumerAdamProcessor {
+public class ConsumerAdamUCenterProcessor {
     @Resource
     IBaseDao baseDao;
 
@@ -81,115 +81,43 @@ public class ConsumerAdamProcessor {
 
     /* ================================================================== ｜ 用户注册 */
 
-    @RabbitListener(bindings = @QueueBinding(
-            exchange = @Exchange(MQConst.EX_LNS_SQL_UCENTER), key = MQConst.RK_SQL_UREGISTER,
+    @RabbitListener(
+            bindings = @QueueBinding(
+                    exchange = @Exchange(MQConst.EX_LNS_SQL_UCENTER),
+                    key = MQConst.RK_SQL_UREGISTER,
                     value = @Queue(MQConst.QUEUES_SQL_UREGISTER)
-    ))
-    public void consumerSqlForURegisterA(Message msg, Channel channel) {
-        this.consumerSqlDaoHandler(msg, channel);
-    }
-    @RabbitListener(bindings = @QueueBinding(
-            exchange = @Exchange(MQConst.EX_LNS_SQL_UCENTER), key = MQConst.RK_SQL_UREGISTER,
-            value = @Queue(MQConst.QUEUES_SQL_UREGISTER)
-    ))
-    public void consumerSqlForURegisterB(Message msg, Channel channel) {
-        this.consumerSqlDaoHandler(msg, channel);
-    }
-    @RabbitListener(bindings = @QueueBinding(
-            exchange = @Exchange(MQConst.EX_LNS_SQL_UCENTER), key = MQConst.RK_SQL_UREGISTER,
-            value = @Queue(MQConst.QUEUES_SQL_UREGISTER)
-    ))
-    public void consumerSqlForURegisterC(Message msg, Channel channel) {
-        this.consumerSqlDaoHandler(msg, channel);
-    }
-    @RabbitListener(bindings = @QueueBinding(
-            exchange = @Exchange(MQConst.EX_LNS_SQL_UCENTER), key = MQConst.RK_SQL_UREGISTER,
-            value = @Queue(MQConst.QUEUES_SQL_UREGISTER)
-    ))
-    public void consumerSqlForURegisterD(Message msg, Channel channel) {
-        this.consumerSqlDaoHandler(msg, channel);
-    }
-    @RabbitListener(bindings = @QueueBinding(
-            exchange = @Exchange(MQConst.EX_LNS_SQL_UCENTER), key = MQConst.RK_SQL_UREGISTER,
-            value = @Queue(MQConst.QUEUES_SQL_UREGISTER)
-    ))
-    public void consumerSqlForURegisterE(Message msg, Channel channel) {
+            ),
+            concurrency = "5"
+    )
+    public void consumerSqlForURegister(Message msg, Channel channel) {
         this.consumerSqlDaoHandler(msg, channel);
     }
 
     /* ================================================================== ｜ 用户信息 */
 
-    @RabbitListener(bindings = @QueueBinding(
-            exchange = @Exchange(MQConst.EX_LNS_SQL_UCENTER), key = MQConst.RK_SQL_UCENTER,
-            value = @Queue(MQConst.QUEUES_SQL_UCENTER)
-    ))
-    public void consumerSqlForUCenterA(Message msg, Channel channel) {
-        this.consumerSqlDaoHandler(msg, channel);
-    }
-    @RabbitListener(bindings = @QueueBinding(
-            exchange = @Exchange(MQConst.EX_LNS_SQL_UCENTER), key = MQConst.RK_SQL_UCENTER,
-            value = @Queue(MQConst.QUEUES_SQL_UCENTER)
-    ))
-    public void consumerSqlForUCenterB(Message msg, Channel channel) {
-        this.consumerSqlDaoHandler(msg, channel);
-    }
-    @RabbitListener(bindings = @QueueBinding(
-            exchange = @Exchange(MQConst.EX_LNS_SQL_UCENTER), key = MQConst.RK_SQL_UCENTER,
+    @RabbitListener(
+            bindings = @QueueBinding(
+                    exchange = @Exchange(MQConst.EX_LNS_SQL_UCENTER),
+                    key = MQConst.RK_SQL_UCENTER,
                     value = @Queue(MQConst.QUEUES_SQL_UCENTER)
-    ))
-    public void consumerSqlForUCenterC(Message msg, Channel channel) {
-        this.consumerSqlDaoHandler(msg, channel);
-    }
-    @RabbitListener(bindings = @QueueBinding(
-            exchange = @Exchange(MQConst.EX_LNS_SQL_UCENTER), key = MQConst.RK_SQL_UCENTER,
-            value = @Queue(MQConst.QUEUES_SQL_UCENTER)
-    ))
-    public void consumerSqlForUCenterD(Message msg, Channel channel) {
-        this.consumerSqlDaoHandler(msg, channel);
-    }
-    @RabbitListener(bindings = @QueueBinding(
-            exchange = @Exchange(MQConst.EX_LNS_SQL_UCENTER), key = MQConst.RK_SQL_UCENTER,
-            value = @Queue(MQConst.QUEUES_SQL_UCENTER)
-    ))
-    public void consumerSqlForUCenterE(Message msg, Channel channel) {
+            ),
+            concurrency = "5"
+    )
+    public void consumerSqlForUCenter(Message msg, Channel channel) {
         this.consumerSqlDaoHandler(msg, channel);
     }
 
     /* ================================================================== ｜ 会员购买 */
 
-    @RabbitListener(bindings = @QueueBinding(
-            exchange = @Exchange(MQConst.EX_LNS_SQL_UCENTER), key = MQConst.RK_SQL_UMEMBER,
-            value = @Queue(MQConst.QUEUES_SQL_UMEMBER)
-    ))
-    public void consumerSqlForUMemberA(Message msg, Channel channel) {
-        this.consumerSqlDaoHandler(msg, channel);
-    }
-    @RabbitListener(bindings = @QueueBinding(
-            exchange = @Exchange(MQConst.EX_LNS_SQL_UCENTER), key = MQConst.RK_SQL_UMEMBER,
-            value = @Queue(MQConst.QUEUES_SQL_UMEMBER)
-    ))
-    public void consumerSqlForUMemberB(Message msg, Channel channel) {
-        this.consumerSqlDaoHandler(msg, channel);
-    }
-    @RabbitListener(bindings = @QueueBinding(
-            exchange = @Exchange(MQConst.EX_LNS_SQL_UCENTER), key = MQConst.RK_SQL_UMEMBER,
-            value = @Queue(MQConst.QUEUES_SQL_UMEMBER)
-    ))
-    public void consumerSqlForUMemberC(Message msg, Channel channel) {
-        this.consumerSqlDaoHandler(msg, channel);
-    }
-    @RabbitListener(bindings = @QueueBinding(
-            exchange = @Exchange(MQConst.EX_LNS_SQL_UCENTER), key = MQConst.RK_SQL_UMEMBER,
-            value = @Queue(MQConst.QUEUES_SQL_UMEMBER)
-    ))
-    public void consumerSqlForUMemberD(Message msg, Channel channel) {
-        this.consumerSqlDaoHandler(msg, channel);
-    }
-    @RabbitListener(bindings = @QueueBinding(
-            exchange = @Exchange(MQConst.EX_LNS_SQL_UCENTER), key = MQConst.RK_SQL_UMEMBER,
+    @RabbitListener(
+            bindings = @QueueBinding(
+                    exchange = @Exchange(MQConst.EX_LNS_SQL_UCENTER),
+                    key = MQConst.RK_SQL_UMEMBER,
                     value = @Queue(MQConst.QUEUES_SQL_UMEMBER)
-    ))
-    public void consumerSqlForUMemberE(Message msg, Channel channel) {
+            ),
+            concurrency = "5"
+    )
+    public void consumerSqlForUMember(Message msg, Channel channel) {
         this.consumerSqlDaoHandler(msg, channel);
     }
 

liquidnet-bus-service/liquidnet-service-consumer-adam/src/test/java/com/liquidnet/service/consumer/service/processor/ConsumerAdamProcessorTest.java → liquidnet-bus-service/liquidnet-service-consumer-adam/src/test/java/com/liquidnet/service/consumer/service/processor/ConsumerAdamUCenterProcessorTest.java

@@ -8,9 +8,9 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest
-public class ConsumerAdamProcessorTest {
+public class ConsumerAdamUCenterProcessorTest {
     @Autowired
-    ConsumerAdamProcessor consumerAdamProcessor;
+    ConsumerAdamUCenterProcessor consumerAdamUCenterProcessor;
 
     @Test
     public void test() {

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/mongo_db_ddl-prod.sql

@@ -4,7 +4,7 @@ db.createCollection("KylinCheckUserPerformanceVo");
 db.createCollection("KylinCheckUserVo");
 db.createCollection("KylinOrderRefundEntitiesVo");
 db.createCollection("KylinOrderRefundPicVo");
-db.createCollection("KylinOrderRefundsVoBase");
+db.createCollection("KylinOrderRefundsVo");
 db.createCollection("KylinOrderTicketEntitiesVo");
 db.createCollection("KylinOrderTicketVo");
 db.createCollection("KylinPerformanceVo");
@@ -21,8 +21,8 @@ db.KylinCheckUserVo.createIndex({mobile:"hashed"});
 db.KylinOrderRefundEntitiesVo.createIndex({orderRefundsId:"hashed"});
 db.KylinOrderRefundEntitiesVo.createIndex({orderTicketEntitiesId:"hashed"});
 db.KylinOrderRefundPicVo.createIndex({orderRefundsId:"hashed"});
-db.KylinOrderRefundsVoBase.createIndex({orderRefundsId:"hashed"});
-db.KylinOrderRefundsVoBase.createIndex({orderTicketsId:"hashed"});
+db.KylinOrderRefundsVo.createIndex({orderRefundsId:"hashed"});
+db.KylinOrderRefundsVo.createIndex({orderTicketsId:"hashed"});
 db.KylinOrderTicketEntitiesVo.createIndex({orderTicketEntitiesId:"hashed"});
 db.KylinOrderTicketEntitiesVo.createIndex({orderId:"hashed"});
 db.KylinOrderTicketVo.createIndex({orderTicketsId:"hashed"});
@@ -42,7 +42,7 @@ sh.shardCollection("prod_ln_scene.KylinCheckUserPerformanceVo",{"checkUserId":"h
 sh.shardCollection("prod_ln_scene.KylinCheckUserVo",{"checkUserId":"hashed"});
 sh.shardCollection("prod_ln_scene.KylinOrderRefundEntitiesVo",{"orderRefundsEntitiesId":"hashed"});
 sh.shardCollection("prod_ln_scene.KylinOrderRefundPicVo",{"refundPicId":"hashed"});
-sh.shardCollection("prod_ln_scene.KylinOrderRefundsVoBase",{"orderRefundsId":"hashed"});
+sh.shardCollection("prod_ln_scene.KylinOrderRefundsVo",{"orderRefundsId":"hashed"});
 sh.shardCollection("prod_ln_scene.KylinOrderTicketEntitiesVo",{"orderTicketEntitiesId":"hashed"});
 sh.shardCollection("prod_ln_scene.KylinOrderTicketVo",{"orderTicketsId":"hashed"});
 sh.shardCollection("prod_ln_scene.KylinPerformanceVo",{"performancesId":"hashed"});

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

@@ -4,7 +4,7 @@ db.createCollection("KylinCheckUserPerformanceVo");
 db.createCollection("KylinCheckUserVo");
 db.createCollection("KylinOrderRefundEntitiesVo");
 db.createCollection("KylinOrderRefundPicVo");
-db.createCollection("KylinOrderRefundsVoBase");
+db.createCollection("KylinOrderRefundsVo");
 db.createCollection("KylinOrderTicketEntitiesVo");
 db.createCollection("KylinOrderTicketVo");
 db.createCollection("KylinPerformanceVo");
@@ -21,8 +21,8 @@ db.KylinCheckUserVo.createIndex({mobile:"hashed"});
 db.KylinOrderRefundEntitiesVo.createIndex({orderRefundsId:"hashed"});
 db.KylinOrderRefundEntitiesVo.createIndex({orderTicketEntitiesId:"hashed"});
 db.KylinOrderRefundPicVo.createIndex({orderRefundsId:"hashed"});
-db.KylinOrderRefundsVoBase.createIndex({orderRefundsId:"hashed"});
-db.KylinOrderRefundsVoBase.createIndex({orderTicketsId:"hashed"});
+db.KylinOrderRefundsVo.createIndex({orderRefundsId:"hashed"});
+db.KylinOrderRefundsVo.createIndex({orderTicketsId:"hashed"});
 db.KylinOrderTicketEntitiesVo.createIndex({orderTicketEntitiesId:"hashed"});
 db.KylinOrderTicketEntitiesVo.createIndex({orderId:"hashed"});
 db.KylinOrderTicketVo.createIndex({orderTicketsId:"hashed"});
@@ -42,7 +42,7 @@ sh.shardCollection("test_ln_scene.KylinCheckUserPerformanceVo",{"checkUserId":"h
 sh.shardCollection("test_ln_scene.KylinCheckUserVo",{"checkUserId":"hashed"});
 sh.shardCollection("test_ln_scene.KylinOrderRefundEntitiesVo",{"orderRefundsEntitiesId":"hashed"});
 sh.shardCollection("test_ln_scene.KylinOrderRefundPicVo",{"refundPicId":"hashed"});
-sh.shardCollection("test_ln_scene.KylinOrderRefundsVoBase",{"orderRefundsId":"hashed"});
+sh.shardCollection("test_ln_scene.KylinOrderRefundsVo",{"orderRefundsId":"hashed"});
 sh.shardCollection("test_ln_scene.KylinOrderTicketEntitiesVo",{"orderTicketEntitiesId":"hashed"});
 sh.shardCollection("test_ln_scene.KylinOrderTicketVo",{"orderTicketsId":"hashed"});
 sh.shardCollection("test_ln_scene.KylinPerformanceVo",{"performancesId":"hashed"});

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/pom.xml

@@ -33,14 +33,6 @@
             <artifactId>spring-boot-starter-data-mongodb</artifactId>
         </dependency>
         <!-- other -->
-        <dependency>
-            <groupId>taobao-sdk-impl</groupId>
-            <artifactId>taobao-sdk-impl</artifactId>
-            <version>0.0.2</version>
-            <type>jar</type>
-            <scope>system</scope>
-            <systemPath>${basedir}/lib/taobao-sdk-java-auto_1600401599540-20210607-impl.jar</systemPath>
-        </dependency>
         <dependency>
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-service-kylin-api</artifactId>

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

-package com.liquidnet.service.kylin.utils;
-
-import com.taobao.api.DefaultTaobaoClient;
-import com.taobao.api.TaobaoClient;
-import org.springframework.stereotype.Service;
-
-@Service
-public class TaobaoTicketUtils {
-
-    private String URL = "http://gw.api.taobao.com/router/rest";
-    private String APPKEY = "27542597";
-    private String SECRET = "900025efc616fd2446344bb8fa21d039";
-    private String SUPPLIER_SECRET= "444d0752439f921a75eaf5951a8bc03c";
-    private Long SYSTEM_ID= 15669L;
-//    private String url = "http://gw.api.tbsandbox.com/router/rest";
-//    private String appkey = "4272";
-//    private String secret = "0ebbcccfee18d7ad1aebc5b135ffa906";
-    private TaobaoClient client = null;
-
-    public TaobaoClient initTaobaoClient() {
-        if (client == null) {
-            client = new DefaultTaobaoClient(URL, APPKEY, SECRET);
-        }
-        return client;
-    }
-
-    public String getSupplierSecret(){
-        return SUPPLIER_SECRET;
-    }
-
-    public Long getSystemId(){
-        return SYSTEM_ID;
-    }
-}

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

 package com.liquidnet.service.order.controller;
 
 
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.PayAgainParam;
 import com.liquidnet.service.kylin.dto.param.PayOrderParam;
 import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
 import com.liquidnet.service.kylin.dto.vo.returns.*;
-import com.liquidnet.service.kylin.service.IKylinOrderTicketsService;
+import com.liquidnet.service.kylin.service.IKylinOrderTicketsOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import java.util.HashMap;
-import java.util.List;
 
 /**
  * <p>
@@ -36,20 +34,20 @@ import java.util.List;
 public class KylinOrderTicketsController {
 
     @Autowired
-    IKylinOrderTicketsService orderTicketsService;
+    IKylinOrderTicketsOrderService orderTicketsOrderService;
 
     @PostMapping("pre")
     @ApiOperation("下单")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<PayResultVo> checkCanOrder(@RequestBody @Valid PayOrderParam payOrderParam) {
-        return orderTicketsService.checkCanOrder(payOrderParam);
+        return orderTicketsOrderService.checkCanOrder(payOrderParam);
     }
 
     @PostMapping("payAgain")
     @ApiOperation("再次支付")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<PayResultVo> payAgain(@RequestBody @Valid PayAgainParam payAgainParam) {
-        PayResultVo vo = orderTicketsService.payAgain(payAgainParam).getData();
+        PayResultVo vo = orderTicketsOrderService.payAgain(payAgainParam).getData();
         if (null == vo) {
             return ResponseDto.failure(ErrorMapping.get("20024"));
         } else {
@@ -61,14 +59,14 @@ public class KylinOrderTicketsController {
     @ApiOperation("支付回调")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public String syncOrder(@ModelAttribute @Valid SyncOrderParam syncOrderParam) {
-        return orderTicketsService.syncOrder(syncOrderParam);
+        return orderTicketsOrderService.syncOrder(syncOrderParam);
     }
 
     @GetMapping("checkPayment")
     @ApiOperation("订单状态")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<HashMap> checkOrderResult(@RequestParam("orderId") @NotNull(message = "订单id不能为空") String orderId) {
-        Integer status = orderTicketsService.checkOrderResult(orderId).getData();
+        Integer status = orderTicketsOrderService.checkOrderResult(orderId).getData();
         if (null == status) {
             return ResponseDto.failure(ErrorMapping.get("20003"));
         } else {

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

@@ -27,6 +27,7 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.returns.*;
 import com.liquidnet.service.kylin.entity.*;
+import com.liquidnet.service.kylin.service.IKylinOrderTicketsOrderService;
 import com.liquidnet.service.kylin.service.IKylinOrderTicketsService;
 import com.liquidnet.service.order.utils.*;
 import com.mongodb.BasicDBObject;
@@ -63,7 +64,7 @@ import java.util.*;
  */
 @Service
 @Slf4j
-public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
+public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderService {
 
     @Value("${liquidnet.url-pay.pay}")
     private String payUrl;
@@ -95,7 +96,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
     @Autowired
     private OrderRefundOvertimeServiceImpl orderRefundsCallbackService;
 
-
     ArrayList<Integer> canBuyStatus = new ArrayList() {{
         add(6);
         add(8);
@@ -103,7 +103,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
         add(10);
     }};
 
-
     @Override
     public ResponseDto<PayResultVo> checkCanOrder(PayOrderParam payOrderParam) {
         Long currentTime;
@@ -951,44 +950,4 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             return false;
         }
     }
-
-    @Override
-    public PageInfo<List<KylinOrderListVo>> orderList() {
-        return null;
-    }
-
-    @Override
-    public OrderDetailsVo orderDetails(String orderId) {
-        return null;
-    }
-
-    @Override
-    public ResponseDto<Integer> orderUnPayCount() {
-        return null;
-    }
-
-    @Override
-    public KylinOrderTicketPreVo toOrderRefundDetails(String orderId) {
-        return null;
-    }
-
-    @Override
-    public OrderRefundVo orderRefundDetails(String orderId, String orderRefundId) {
-        return null;
-    }
-
-    @Override
-    public String sendOrderRefund(String orderId, String orderTicketEntitiesId, String reason, String picList) {
-        return null;
-    }
-
-    @Override
-    public ResponseDto<Boolean> orderRefundWithdraw(String orderRefundsId) {
-        return null;
-    }
-
-    @Override
-    public Boolean orderRefundAgain(String orderRefundsId) {
-        return null;
-    }
 }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/refund/KylinRefundsStatusServiceImpl.java

@@ -203,6 +203,8 @@ public class KylinRefundsStatusServiceImpl {
                 Query.query(Criteria.where("orderRefundsId").is(refundInfo.getOrderRefundsId())).getQueryObject(),
                 object
         );
+        dataUtils.delOrderRefundVo(refundInfo.getOrderRefundsId());
+        dataUtils.delOrderRefundVoByOrderId(refundInfo.getOrderTicketsId());
 
         if (refundInfo.getType() == KylinTableStatusConst.ORDER_REFUND_TYPE_APPLY) {
             // 退还库存

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/refund/OrderRefundsCallbackServiceImpl.java

 package com.liquidnet.service.platform.service.refund;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.liquidnet.commons.lang.util.JsonUtils;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
 import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
 import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.IKylinOrderRefundsService;
+import com.liquidnet.service.platform.utils.DataUtils;
 import com.mongodb.BasicDBObject;
 import com.mongodb.client.result.UpdateResult;
 import lombok.extern.slf4j.Slf4j;
@@ -22,6 +21,8 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -46,6 +47,9 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
     @Autowired
     private MongoConverter mongoConverter;
 
+    @Autowired
+    private DataUtils dataUtils;
+
     public String refundCallback(RefundCallbackParam refundCallbackParam) {
         KylinOrderRefunds refundInfo = kylinOrderRefundsMapper.selectOne(
                 new UpdateWrapper<KylinOrderRefunds>()
@@ -94,6 +98,8 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
                     Query.query(Criteria.where("orderRefundsId").is(refundInfo.getOrderRefundsId())).getQueryObject(),
                     object
             );
+            dataUtils.delOrderRefundVo(refundInfo.getOrderRefundsId());
+            dataUtils.delOrderRefundVoByOrderId(refundInfo.getOrderTicketsId());
         }
         return "success";
     }