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

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

@@ -28,6 +28,8 @@ import java.util.List;
 @ApiModel
 public class KylinOrderRefundsVo implements Serializable,Cloneable {
 
+    private static final long serialVersionUID = 268172565273929795L;
+
     @ApiModelProperty(value = "主键ID")
     private String orderRefundsId;
 
@@ -167,10 +169,10 @@ public class KylinOrderRefundsVo implements Serializable,Cloneable {
                     this.statusName = "退款失败";
                     break;
                 case 7:
-                    this.statusName = "二审通过等待退款";
+                    this.statusName = "财务通过等待退款";
                     break;
                 case 8:
-                    this.statusName = "二审驳回退款";
+                    this.statusName = "财务驳回退款";
                     break;
                 default:
                     this.statusName = "其他";

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/OrderRefundDao.java

@@ -103,10 +103,10 @@ public class OrderRefundDao implements Serializable {
                 this.statusName="退款失败";
                 break;
             case 7:
-                this.statusName="二审通过等待退款";
+                this.statusName="财务通过等待退款";
                 break;
             case 8:
-                this.statusName="二审驳回退款";
+                this.statusName="财务驳回退款";
                 break;
             case 9:
                 this.statusName="已确认收货";

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

@@ -18,9 +18,9 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class KylinOrderRefunds implements Serializable {
+public class KylinOrderRefunds implements Serializable, Cloneable{
 
-    private static final long serialVersionUID = 1L;
+    private static final long serialVersionUID = 5901424962410128552L;
 
     @TableId(value = "mid", type = IdType.AUTO)
     private Integer mid;

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.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.liquidnet.commons.lang.util.HttpUtil;
@@ -8,6 +7,7 @@ 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.entity.KylinOrderTicketStatus;
 import com.liquidnet.service.kylin.entity.KylinOrderTickets;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.IKylinOrderRefundsService;
@@ -52,6 +52,8 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
     private KylinOrderRefundsMapper kylinOrderRefundsMapper;
     @Autowired
     private KylinOrderTicketsMapper kylinOrderTicketsMapper;
+    @Autowired
+    private KylinOrderTicketStatusMapper kylinOrderTicketStatusMapper;
 
     @Autowired
     MongoTemplate mongoTemplate;
@@ -61,24 +63,32 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
     private DataUtils dataUtils;
 
     public String refundCallback(RefundCallbackParam refundCallbackParam) {
-        log.info("订单退款回调参数：[RefundCallbackParam={}]", refundCallbackParam);
+        log.info("refundCallback订单退款回调参数: [RefundCallbackParam={}]", refundCallbackParam);
         KylinOrderRefunds refundInfo = kylinOrderRefundsMapper.selectOne(
-                new UpdateWrapper<KylinOrderRefunds>()
-                        .eq("order_refund_code", refundCallbackParam.getOrderRefundCode())
+                Wrappers.lambdaQuery(KylinOrderRefunds.class).eq(KylinOrderRefunds::getOrderRefundCode, refundCallbackParam.getOrderRefundCode())
         );
+
         if (refundInfo == null) {
-            log.info("Failed:{}.RefundController refundCallback: 退款订单查询失败，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrderRefundCode());
+            log.info("refundCallback: 退款订单查询失败，编号{}", refundCallbackParam.getOrderRefundCode());
             return "fail";
         }
         if (refundInfo.getStatus() == KylinTableStatusConst.ORDER_REFUND_STATUS_CANCEL || refundInfo.getStatus() == KylinTableStatusConst.ORDER_REFUND_STATUS_REJECT) {
-            log.info("Failed:{}.RefundController refundCallback: 退款订单已取消或已运营审核拒绝，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrderRefundCode());
+            log.info("refundCallback: 退款订单已取消，编号{}", refundCallbackParam.getOrderRefundCode());
             return "fail";
         }
         if (refundInfo.getStatus() == KylinTableStatusConst.ORDER_REFUND_STATUS_REFUNDED) {
-            log.info("Failed:{}.RefundController refundCallback: 退款订单已退款，编号{}", "KylinOrderRefundsServiceImplRefundCallback", refundCallbackParam.getOrderRefundCode());
+            log.info("refundCallback: 退款订单已完成，编号{}", refundCallbackParam.getOrderRefundCode());
             return "success";
         }
 
+        /*KylinOrderTicketStatus kylinOrderTicketStatus = kylinOrderTicketStatusMapper.selectOne(
+                Wrappers.lambdaQuery(KylinOrderTicketStatus.class).eq(KylinOrderTicketStatus::getOrderId, refundInfo.getOrderTicketsId())
+        );
+        if (kylinOrderTicketStatus.getStatus() == KylinTableStatusConst.ORDER_STATUS4) {
+            log.info("refundCallback: 票订单已完成退款，编号{}", refundInfo.getOrderTicketsId());
+            return "success";
+        }*/
+
         Integer status = refundCallbackParam.getStatus();
         if (1 == status) { // 退款成功
             boolean res = kylinRefundsStatusServiceImpl.orderTicketRefunded(refundCallbackParam, refundInfo);
@@ -97,7 +107,7 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
             kylinOrderRefunds.setUpdatedAt(LocalDateTime.now());
             kylinOrderRefundsMapper.update(
                     kylinOrderRefunds,
-                    new UpdateWrapper<KylinOrderRefunds>().eq("order_refunds_id", refundInfo.getOrderRefundsId())
+                    Wrappers.lambdaUpdate(KylinOrderRefunds.class).eq(KylinOrderRefunds::getOrderRefundsId, refundInfo.getOrderRefundsId())
             );
             // 修改缓存
             KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();