exit

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileAgentVo.java → liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SmileAgentVo.java

-package com.liquidnet.client.admin.zhengzai.smile.dto;
+package com.liquidnet.service.goblin.dto.vo;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * <p>
  * 
@@ -18,7 +20,7 @@ public class SmileAgentVo {
     /**
      * 演出id
      */
-    private String showId;
+    private String performanceId;
 
     /**
      * 票id
@@ -33,12 +35,12 @@ public class SmileAgentVo {
     /**
      * 总代票提
      */
-    private Double totalCarry;
+    private BigDecimal totalCarry;
 
     /**
      * 普代票提
      */
-    private Double ordCarry;
+    private BigDecimal ordCarry;
 
 
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileOrganizationVo.java

@@ -29,9 +29,9 @@ public class SmileOrganizationVo{
     private String name;
 
     /**
-     * 省key
+     * 省Id
      */
-    private Integer provinceKey;
+    private String provinceId;
 
     /**
      * 省
@@ -39,9 +39,9 @@ public class SmileOrganizationVo{
     private String province;
 
     /**
-     * 市key
+     * 市Id
      */
-    private Integer cityKey;
+    private String cityId;
 
     /**
      * 市
@@ -49,9 +49,9 @@ public class SmileOrganizationVo{
     private String city;
 
     /**
-     * 区key
+     * 区Id
      */
-    private Integer areaKey;
+    private String areaId;
 
     /**
      * 区

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileUserVo.java

@@ -41,9 +41,9 @@ public class SmileUserVo {
     private String phone;
 
     /**
-     * 省key
+     * 省Id
      */
-    private String provinceKey;
+    private String provinceId;
 
     /**
      * 省
@@ -51,9 +51,9 @@ public class SmileUserVo {
     private String province;
 
     /**
-     * 市key
+     * 市Id
      */
-    private String cityKey;
+    private String cityId;
 
     /**
      * 市
@@ -61,9 +61,9 @@ public class SmileUserVo {
     private String city;
 
     /**
-     * 区key
+     * 区Id
      */
-    private String areaKey;
+    private String areaId;
 
     /**
      * 区

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/UserCheckVo.java

@@ -42,9 +42,9 @@ public class UserCheckVo {
     private String phone;
 
     /**
-     * 省key
+     * 省Id
      */
-    private String provinceKey;
+    private String provinceId;
 
     /**
      * 省
@@ -52,9 +52,9 @@ public class UserCheckVo {
     private String province;
 
     /**
-     * 市key
+     * 市Id
      */
-    private String cityKey;
+    private String cityId;
 
     /**
      * 市
@@ -62,9 +62,9 @@ public class UserCheckVo {
     private String city;
 
     /**
-     * 区key
+     * 区Id
      */
-    private String areaKey;
+    private String areaId;
 
     /**
      * 区

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/SmileAgent.java

@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * <p>
@@ -24,7 +25,7 @@ public class SmileAgent implements Serializable {
     /**
      * 演出id
      */
-    private String showId;
+    private String performanceId;
 
     /**
      * 票id
@@ -36,15 +37,16 @@ public class SmileAgent implements Serializable {
      */
     private String ticketType;
 
+
     /**
      * 总代票提
      */
-    private Double totalCarry;
+    private BigDecimal totalCarry;
 
     /**
      * 普代票提
      */
-    private Double ordCarry;
+    private BigDecimal ordCarry;
 
 
 }

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/SmileSchool.java

@@ -37,9 +37,9 @@ public class SmileSchool implements Serializable {
     private String address;
 
     /**
-     * 省key
+     * 省Id
      */
-    private String provinceKey;
+    private String provinceId;
 
     /**
      * 省
@@ -47,9 +47,9 @@ public class SmileSchool implements Serializable {
     private String province;
 
     /**
-     * 市key
+     * 市Id
      */
-    private String cityKey;
+    private String cityId;
 
     /**
      * 市
@@ -57,9 +57,9 @@ public class SmileSchool implements Serializable {
     private String city;
 
     /**
-     * 区key
+     * 区Id
      */
-    private String areaKey;
+    private String areaId;
 
     /**
      * 区

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/SmileUser.java

@@ -56,9 +56,9 @@ public class SmileUser implements Serializable {
     private String phone;
 
     /**
-     * 省key
+     * 省Id
      */
-    private String provinceKey;
+    private String provinceId;
 
     /**
      * 省
@@ -66,9 +66,9 @@ public class SmileUser implements Serializable {
     private String province;
 
     /**
-     * 市key
+     * 市Id
      */
-    private String cityKey;
+    private String cityId;
 
     /**
      * 市
@@ -76,9 +76,9 @@ public class SmileUser implements Serializable {
     private String city;
 
     /**
-     * 区key
+     * 区Id
      */
-    private String areaKey;
+    private String areaId;
 
     /**
      * 区
@@ -96,7 +96,7 @@ public class SmileUser implements Serializable {
     private String wechat;
 
     /**
-     * 代理类型（1：总代，2：普代）
+     * 代理类型（0：未审核，1：总代，2：普代，3：未认证）
      */
     private Integer type;