Merge branch 'dev' into test

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

@@ -194,7 +194,6 @@ public class KylinOrderRefundsServiceImpl extends ServiceImpl<KylinOrderRefundsM
                 ticketEntityIds, realRefundPriceList
         );
 
-//        KylinOrderTicketVo vo = new KylinOrderTicketVo();
         HashMap<String,Object> map = new HashMap<>();
         map.put("isHaveRefundDetails",1);
         BasicDBObject obj = new BasicDBObject("$set", mongoConverter.convertToMongoType(map));

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

@@ -74,8 +74,10 @@ public class GlobalAuthorityInterceptor extends HandlerInterceptorAdapter {
 
             } catch (ExpiredJwtException expiredJwtEx) {
                 responseCode = TOKEN_INVALID;
+                log.error("Ex.ExpiredJwtException:{},responseCode:{}", expiredJwtEx.getMessage(), responseCode);
             } catch (Exception ex) {
                 responseCode = TOKEN_ILLEGAL;
+                log.error("Ex.Exception:{},responseCode:{}", ex.getMessage(), responseCode);
             }
         } else {
             responseCode = TOKEN_ILLEGAL;
@@ -88,6 +90,7 @@ public class GlobalAuthorityInterceptor extends HandlerInterceptorAdapter {
         }
         if (StringUtils.isNotEmpty(responseCode)) {
             this.responseHandler(response, responseCode);
+            log.warn("Authority failed:{},uri:[{}],authorization:{}", responseCode, uri, authorization);
             return false;
         }
         if (StringUtils.isEmpty(currentUid)) {

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/OrderRefundCallbackController.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/controller/OrderRefundOvertimeController.java

 package com.liquidnet.service.kylin.controller;
 
-import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
-import com.liquidnet.service.kylin.service.impl.OrderRefundsCallbackServiceImpl;
+import com.liquidnet.service.kylin.service.impl.OrderRefundOvertimeServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -23,10 +22,10 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(tags = "前端-退款回调")
 @RestController
 @RequestMapping("refund")
-public class OrderRefundCallbackController {
+public class OrderRefundOvertimeController {
 
     @Autowired
-    private OrderRefundsCallbackServiceImpl orderRefundsCallbackServiceImpl;
+    private OrderRefundOvertimeServiceImpl orderRefundOvertimeServiceImpl;
 
     @PostMapping("apply")
     @ApiOperation("超时退款")
@@ -35,7 +34,7 @@ public class OrderRefundCallbackController {
     })
     public Boolean refundApply(@RequestParam() String orderTicketsId) {
         try {
-            Boolean res = orderRefundsCallbackServiceImpl.refundApply(orderTicketsId);
+            Boolean res = orderRefundOvertimeServiceImpl.refundApply(orderTicketsId);
             if (res) {
                 return true;
             } else {
@@ -46,10 +45,4 @@ public class OrderRefundCallbackController {
         }
     }
 
-    @PostMapping("callback")
-    @ApiOperation("退款回调")
-    public String refundCallback(RefundCallbackParam refundCallbackParam) {
-        String result = orderRefundsCallbackServiceImpl.refundCallback(refundCallbackParam);
-        return result;
-    }
 }

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

 package com.liquidnet.service.kylin.service.impl;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
@@ -31,16 +30,12 @@ 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.mongodb.client.result.UpdateResult;
 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.bson.Document;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,7 +52,6 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.stream.Collectors;
 
 
 /**
@@ -108,7 +102,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
     @Autowired
     private KylinOrderTicketRelationsMapper orderTicketRelationsMapper;
     @Autowired
-    private OrderRefundsCallbackServiceImpl orderRefundsCallbackService;
+    private OrderRefundOvertimeServiceImpl orderRefundsCallbackService;
     @Autowired
     private KylinRefundsStatusServiceImpl refundsStatusService;
 

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/OrderRefundsCallbackServiceImpl.java → liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/OrderRefundOvertimeServiceImpl.java

@@ -3,10 +3,8 @@ package com.liquidnet.service.kylin.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dao.KylinOrderTicketEntitiesDao;
-import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
 import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
@@ -33,7 +31,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
-public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefundsMapper, KylinOrderRefunds> implements IKylinOrderRefundsService {
+public class OrderRefundOvertimeServiceImpl extends ServiceImpl<KylinOrderRefundsMapper, KylinOrderRefunds> implements IKylinOrderRefundsService {
     @Autowired
     private KylinRefundsStatusServiceImpl kylinRefundsStatusServiceImpl;
 
@@ -43,9 +41,6 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
     @Autowired
     private KylinOrderTicketsMapper kylinOrderTicketsMapper;
 
-    @Autowired
-    private KylinOrderTicketStatusMapper kylinOrderTicketStatusMapper;
-
     @Autowired
     private KylinOrderTicketEntitiesMapper kylinOrderTicketEntitiesMapper;
 
@@ -58,51 +53,6 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
     @Autowired
     private DataUtils dataUtils;
 
-    public String refundCallback(RefundCallbackParam refundCallbackParam) {
-        KylinOrderRefunds refundInfo = kylinOrderRefundsMapper.selectOne(
-                new UpdateWrapper<KylinOrderRefunds>()
-                        .eq("order_refund_code", refundCallbackParam.getOrder_refund_code())
-        );
-        if (refundInfo == null) {
-            log.info("Failed:{}.RefundController refundCallback: 退款订单查询失败，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrder_refund_code());
-            return "fail";
-        }
-        if (refundInfo.getStatus() == KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL) {
-            log.info("Failed:{}.RefundController refundCallback: 退款订单已取消，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrder_refund_code());
-            return "fail";
-        }
-        if (refundInfo.getStatus() == KylinTableStatusConst.ORDER_REFUND_STATUS_REFUNDED) {
-            log.info("Failed:{}.RefundController refundCallback: 退款订单已退款，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrder_refund_code());
-            return "success";
-        }
-
-        Integer status = refundCallbackParam.getStatus();
-        if (1 == status) { // 退款成功
-            boolean res = kylinRefundsStatusServiceImpl.orderTicketRefunded(refundCallbackParam, refundInfo);
-            if (res) {
-                return "success";
-            } else {
-                return "fail";
-            }
-        }
-        if (0 == status) { // 退款失败
-            KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
-            kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_ERROR);
-            kylinOrderRefunds.setRefundCode(refundCallbackParam.getRefund_code());
-            kylinOrderRefunds.setRefundType(refundCallbackParam.getRefund_type());
-            kylinOrderRefunds.setRefundId(refundCallbackParam.getRefund_id());
-            kylinOrderRefunds.setRefundAt(refundCallbackParam.getRefund_at());
-            kylinOrderRefunds.setRefundError(refundCallbackParam.getRefund_error());
-            kylinOrderRefunds.setUpdatedAt(LocalDateTime.now());
-
-            kylinOrderRefundsMapper.update(
-                    kylinOrderRefunds,
-                    new UpdateWrapper<KylinOrderRefunds>().eq("order_refund_code", refundCallbackParam.getOrder_refund_code())
-            );
-        }
-        return "success";
-    }
-
     public Boolean refundApply(String orderTicketsId) {
         KylinOrderTickets orderInfo = kylinOrderTicketsMapper.selectOne(
                 new QueryWrapper<KylinOrderTickets>().eq("order_tickets_id", orderTicketsId)