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

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

@@ -25,7 +25,7 @@ liquidnet:
   url-pay:
     pay: http://testpay.zhengzai.tv
     check: http://testpay.zhengzai.tv/order/verify
-    callback: http://zuul.zhengzai.tv/adam/member/order/callback
+    callback: http://adam.zhengzai.tv/adam/member/order/callback
   url-service:
     url: http://testservice.zhengzai.tv
   aliyun:

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

@@ -25,6 +25,6 @@ liquidnet:
   url-pay:
     pay: http://testpay.zhengzai.tv/
     check: http://testpay.zhengzai.tv/order/verify
-    localUrl: http://devzuul.zhengzai.tv/kylin/order/syncOrder
+    localUrl: http://devkylin.zhengzai.tv/kylin/order/syncOrder
   url-service:
-    url: http://testservice.zhengzai.tv/
\ No newline at end of file
+    url: http://testservice.zhengzai.tv/

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

@@ -25,6 +25,6 @@ liquidnet:
   url-pay:
     pay: http://testpay.zhengzai.tv/
     check: http://testpay.zhengzai.tv/order/verify
-    localUrl: http://devzuul.zhengzai.tv/kylin/order/syncOrder
+    localUrl: http://kylin.zhengzai.tv/kylin/order/syncOrder
   url-service:
     url: http://testservice.zhengzai.tv/

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

@@ -3,6 +3,7 @@ package com.liquidnet.service.kylin.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.io.Serializable;
 
@@ -96,6 +97,11 @@ public class KylinOrderTicketEntities implements Serializable {
      */
     private Integer isPayment;
 
+    /**
+     * 已退款金额
+     */
+    private BigDecimal refundPrice;
+
     /**
      * comment
      */