表字段增加

mp-service/src/main/java/com/qs/mp/admin/domain/TicketBox.java

@@ -116,6 +116,12 @@ public class TicketBox implements Serializable {
   @TableField("sale_comm_rate")
   private BigDecimal saleCommRate;
 
+  /**
+   * 分佣的销售额百分比
+   */
+  @TableField("properties")
+  private String properties;
+
   /**
    * 状态，上架/下架
    */

mp-service/src/main/java/com/qs/mp/channel/domain/Channel.java

@@ -61,23 +61,41 @@ public class Channel implements Serializable {
   private BigDecimal commRate;
 
   /**
-   * 省份
+   * 省ID
+   */
+  @TableField("province_id")
+  private Long provinceId;
+
+  /**
+   * 省
    */
   @TableField("province")
   private String province;
 
   /**
-   * 市
+   * 城市
    */
   @TableField("city")
   private String city;
 
+  /**
+   * 城市ID
+   */
+  @TableField("city_id")
+  private Long cityId;
+
   /**
    * 区
    */
   @TableField("area")
   private String area;
 
+  /**
+   * 区ID
+   */
+  @TableField("area_id")
+  private Long areaId;
+
   /**
    * 详细地址
    */

mp-service/src/main/java/com/qs/mp/channel/domain/ChannelCart.java

@@ -22,8 +22,8 @@ public class ChannelCart implements Serializable {
   /**
    * 主键
    */
-  @TableId(value = "id" , type = IdType.AUTO)
-  private Long id;
+  @TableId(value = "cart_id" , type = IdType.AUTO)
+  private Long cartId;
 
   /**
    * 渠道ID

mp-service/src/main/java/com/qs/mp/channel/domain/ChannelOrder.java

@@ -43,6 +43,12 @@ public class ChannelOrder implements Serializable {
   @TableField("order_amt")
   private Integer orderAmt;
 
+  /**
+   * 优惠金额
+   */
+  @TableField("discount_amt")
+  private Integer discountAmt;
+
   /**
    * 运费金额
    */
@@ -56,10 +62,16 @@ public class ChannelOrder implements Serializable {
   private Integer payAmt;
 
   /**
-   * 订单状态
+   * 订单状态，-1 已取消 0:待付款 1:待发货 2:待收货 3:已完成
    */
   @TableField("status")
-  private String status;
+  private Integer status;
+
+  /**
+   * 商品总数
+   */
+  @TableField("prod_num")
+  private Integer prodNum;
 
   /**
    * 备注

mp-service/src/main/java/com/qs/mp/channel/domain/ChannelOrderItem.java

@@ -55,6 +55,18 @@ public class ChannelOrderItem implements Serializable {
   @TableField("box_id")
   private String boxId;
 
+  /**
+   * 盲票组属性
+   */
+  @TableField("properties")
+  private String properties;
+
+  /**
+   * 盲票面值
+   */
+  @TableField("face_price")
+  private Integer facePrice;
+
   /**
    * 盲票包数量
    */
@@ -64,8 +76,8 @@ public class ChannelOrderItem implements Serializable {
   /**
    * 盲票包单价
    */
-  @TableField("sale_price")
-  private Integer salePrice;
+  @TableField("pkg_sale_price")
+  private Integer pkgSalePrice;
 
   /**
    * 创建时间

mp-service/src/main/resources/mapper/admin/TicketBoxMapper.xml

@@ -20,6 +20,7 @@
         <result column="face_price" property="facePrice" />
         <result column="sale_price" property="salePrice" />
         <result column="sale_comm_rate" property="saleCommRate" />
+        <result column="properties" property="properties" />
         <result column="status" property="status" />
         <result column="created_time" property="createdTime" />
         <result column="updated_time" property="updatedTime" />
@@ -27,7 +28,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        box_id, title, pic_url, category, description, type, quantity, sale_qty, box_price, box_sale_price, pkg_unit, pkg_qty, sale_pkg_qty, face_price, sale_price, sale_comm_rate, status, created_time, updated_time
+        box_id, title, pic_url, category, description, type, quantity, sale_qty, box_price, box_sale_price, pkg_unit, pkg_qty, sale_pkg_qty, face_price, sale_price, sale_comm_rate, properties, status, created_time, updated_time
     </sql>
 
 </mapper>

mp-service/src/main/resources/mapper/channel/ChannelAddrMapper.xml

@@ -7,8 +7,8 @@
         <id column="addr_id" property="addrId" />
         <result column="channel_id" property="channelId" />
         <result column="receiver" property="receiver" />
-        <result column="province_id" property="provinceId" />
         <result column="province" property="province" />
+        <result column="province_id" property="provinceId" />
         <result column="city" property="city" />
         <result column="city_id" property="cityId" />
         <result column="area" property="area" />

mp-service/src/main/resources/mapper/channel/ChannelCartMapper.xml

@@ -4,7 +4,7 @@
 
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.qs.mp.channel.domain.ChannelCart">
-        <id column="id" property="id" />
+        <id column="cart_id" property="cartId" />
         <result column="channel_id" property="channelId" />
         <result column="box_id" property="boxId" />
         <result column="order_num" property="orderNum" />
@@ -14,7 +14,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, channel_id, box_id, order_num, created_time, updated_time
+        cart_id, channel_id, box_id, order_num, created_time, updated_time
     </sql>
 
 </mapper>

mp-service/src/main/resources/mapper/channel/ChannelMapper.xml

@@ -11,8 +11,11 @@
         <result column="level" property="level" />
         <result column="comm_rate" property="commRate" />
         <result column="province" property="province" />
+        <result column="province_id" property="provinceId" />
         <result column="city" property="city" />
+        <result column="city_id" property="cityId" />
         <result column="area" property="area" />
+        <result column="area_id" property="areaId" />
         <result column="address" property="address" />
         <result column="contact" property="contact" />
         <result column="mobile" property="mobile" />
@@ -30,7 +33,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        channel_id, channel_no, name, parent_id, level, comm_rate, province, city, area, address, contact, mobile, user_id, money, frozen_money, certify_status, verify_status, biz_license, door_pic, memo, created_time, updated_time
+        channel_id, channel_no, name, parent_id, level, comm_rate, province, province_id, city, city_id, area, area_id, address, contact, mobile, user_id, money, frozen_money, certify_status, verify_status, biz_license, door_pic, memo, created_time, updated_time
     </sql>
 
-</mapper>
+</mapper>

mp-service/src/main/resources/mapper/channel/ChannelOrderItemMapper.xml

@@ -10,15 +10,17 @@
         <result column="title" property="title" />
         <result column="pic_url" property="picUrl" />
         <result column="box_id" property="boxId" />
+        <result column="properties" property="properties" />
+        <result column="face_price" property="facePrice" />
         <result column="order_num" property="orderNum" />
-        <result column="sale_price" property="salePrice" />
+        <result column="pkg_sale_price" property="pkgSalePrice" />
         <result column="created_time" property="createdTime" />
         <result column="updated_time" property="updatedTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, order_id, channel_id, title, pic_url, box_id, order_num, sale_price, created_time, updated_time
+        id, order_id, channel_id, title, pic_url, box_id, properties, face_price, order_num, sale_price, created_time, updated_time
     </sql>
 
 </mapper>

mp-service/src/main/resources/mapper/channel/ChannelOrderMapper.xml

@@ -8,9 +8,11 @@
         <result column="channel_id" property="channelId" />
         <result column="title" property="title" />
         <result column="order_amt" property="orderAmt" />
+        <result column="discount_amt" property="discountAmt" />
         <result column="freight_amt" property="freightAmt" />
         <result column="pay_amt" property="payAmt" />
         <result column="status" property="status" />
+        <result column="prod_num" property="prodNum" />
         <result column="memo" property="memo" />
         <result column="receiver" property="receiver" />
         <result column="tel" property="tel" />
@@ -26,7 +28,7 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        order_id, channel_id, title, order_amt, freight_amt, pay_amt, status, memo, receiver, tel, province, city, area, address, delivery_id, delivery_flow_id, created_time, updated_time
+        order_id, channel_id, title, order_amt, discount_amt, freight_amt, pay_amt, status, prod_num, memo, receiver, tel, province, city, area, address, delivery_id, delivery_flow_id, created_time, updated_time
     </sql>
 
-</mapper>
+</mapper>