数据库修改

diagbotman-service/src/main/java/com/diagbot/entity/LantoneProduct.java

@@ -71,11 +71,6 @@ public class LantoneProduct implements Serializable {
      */
     private String url;
 
-    /**
-     * 机构开通数量
-     */
-    private Integer openNum;
-
     /**
      * 停用状态
      */
@@ -177,14 +172,6 @@ public class LantoneProduct implements Serializable {
         this.url = url;
     }
 
-    public Integer getOpenNum() {
-        return openNum;
-    }
-
-    public void setOpenNum(Integer openNum) {
-        this.openNum = openNum;
-    }
-
     public Integer getServiceStatus() {
         return serviceStatus;
     }
@@ -230,7 +217,6 @@ public class LantoneProduct implements Serializable {
                 ", decription=" + decription +
                 ", chargeType=" + chargeType +
                 ", url=" + url +
-                ", openNum=" + openNum +
                 ", serviceStatus=" + serviceStatus +
                 ", trialStatus=" + trialStatus +
                 ", trialUrl=" + trialUrl +

diagbotman-service/src/main/java/com/diagbot/entity/OpenedProducts.java

@@ -81,6 +81,10 @@ public class OpenedProducts implements Serializable {
      */
     private Integer orderId;
 
+    private Integer accessType;
+
+    private Integer chargeType;
+
 
     public Long getId() {
         return id;
@@ -178,6 +182,22 @@ public class OpenedProducts implements Serializable {
         this.orderId = orderId;
     }
 
+    public Integer getAccessType() {
+        return accessType;
+    }
+
+    public void setAccessType(Integer accessType) {
+        this.accessType = accessType;
+    }
+
+    public Integer getChargeType() {
+        return chargeType;
+    }
+
+    public void setChargeType(Integer chargeType) {
+        this.chargeType = chargeType;
+    }
+
     @Override
     public String toString() {
         return "OpenedProducts{" +
@@ -193,6 +213,8 @@ public class OpenedProducts implements Serializable {
                 ", endTime=" + endTime +
                 ", serviceStatus=" + serviceStatus +
                 ", orderId=" + orderId +
+                ", accessType=" + accessType +
+                ", chargeType=" + chargeType +
                 "}";
     }
 }

diagbotman-service/src/main/resources/mapper/LantoneProductMapper.xml

@@ -14,7 +14,6 @@
         <result column="decription" property="decription" />
         <result column="charge_type" property="chargeType" />
         <result column="url" property="url" />
-        <result column="open_num" property="openNum" />
         <result column="service_status" property="serviceStatus" />
         <result column="trial_status" property="trialStatus" />
         <result column="trial_url" property="trialUrl" />

diagbotman-service/src/main/resources/mapper/OpenedProductsMapper.xml

@@ -16,6 +16,8 @@
         <result column="end_time" property="endTime" />
         <result column="service_status" property="serviceStatus" />
         <result column="order_id" property="orderId" />
+        <result column="access_type" property="accessType" />
+        <result column="charge_type" property="chargeType" />
     </resultMap>
     <select id="selectOpendInfoByUserId" resultMap="BaseResultMap" parameterType="java.util.List">
         SELECT opend.* FROM diag_opened_products opend WHERE user_id = #{userId}