暂时提交

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

@@ -73,7 +73,7 @@ public class KylinOrderTickets implements Serializable {
     /**
      * 数量
      */
-    private String number;
+    private Integer number;
 
     /**
      * 单价
@@ -113,7 +113,7 @@ public class KylinOrderTickets implements Serializable {
     /**
      * 退款张数
      */
-    private BigDecimal priceNumber;
+    private Integer refundNumber;
 
     /**
      * 选择支付方式

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

@@ -417,7 +417,7 @@ CREATE TABLE `kylin_order_tickets`
     `qr_code`              varchar(255)     NOT NULL DEFAULT '' COMMENT '二维码地址',
     `order_type`           varchar(255)     NOT NULL DEFAULT '' COMMENT '下单方式',
     `order_version`        varchar(255)     NOT NULL DEFAULT '' COMMENT '下单版本',
-    `number`               varchar(255)     NOT NULL DEFAULT '' COMMENT '数量',
+    `number`               int(32)          NOT NULL DEFAULT 0 COMMENT '数量',
     `price`                decimal(8, 2)    NOT NULL DEFAULT '0.00' COMMENT '单价',
     `price_member`         decimal(8, 2)    NOT NULL DEFAULT '0.00' COMMENT '会员单价',
     `price_total`          decimal(8, 2)    NOT NULL DEFAULT '0.00' COMMENT '应付价格',
@@ -425,10 +425,10 @@ CREATE TABLE `kylin_order_tickets`
     `price_actual`         decimal(8, 2)    NOT NULL DEFAULT '0.00' COMMENT '实付价格',
     `price_express`        decimal(8, 2)    NOT NULL DEFAULT '0.00' COMMENT '快递价格',
     `price_refund`         decimal(8, 2)    NOT NULL DEFAULT '0.00' COMMENT '退款价格',
-    `price_number`         decimal(8, 2)    NOT NULL DEFAULT '0.00' COMMENT '退款张数',
+    `refund_number`        int(32)          NOT NULL DEFAULT 0 COMMENT '退款张数',
     `pay_type`             varchar(255)     NOT NULL DEFAULT '' COMMENT '选择支付方式',
-    `payment_type`         varchar(255)     NOT NULL DEFAULT '' COMMENT '实际支付方式',
-    `time_pay`             varchar(255)     NOT NULL DEFAULT '' COMMENT '支付时间',
+    `payment_type`         varchar(255)     NULL     DEFAULT '' COMMENT '实际支付方式',
+    `time_pay`             varchar(255)     NULL     DEFAULT '' COMMENT '支付时间',
     `express_contacts`     varchar(255)     NOT NULL DEFAULT '' COMMENT '收货人',
     `express_address`      varchar(255)     NOT NULL DEFAULT '' COMMENT '收货地址',
     `express_phone`        varchar(255)     NOT NULL DEFAULT '' COMMENT '收货人联系方式',

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

@@ -30,6 +30,12 @@
             <version>1.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-api-feign-adam</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
 
         <!-- other -->
         <dependency>