订单表字段添加

jsjp-service/src/main/java/com/miaxis/order/domain/OrderInfo.java

@@ -1,19 +1,16 @@
 package com.miaxis.order.domain;
 
-import java.util.Date;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.miaxis.common.annotation.Excel;
-import com.miaxis.common.core.domain.BaseEntity;
+import com.miaxis.common.core.domain.BaseBusinessEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.miaxis.common.core.domain.BaseBusinessEntity;
 import lombok.Data;
+
+import java.util.Date;
 /**
  * 订单信息对象 order_info
  *
@@ -79,6 +76,35 @@ public class OrderInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = "1:微信 2:支付宝")
     private Integer payType;
 
+    /** 是否分成 */
+    @Excel(name = "是否分成给驾校 0:不分成  1:分成")
+    @TableField("is_share")
+    @ApiModelProperty(value = "是否分成给驾校 0:不分成  1:分成")
+    private int isShare;
+
+    /** 驾校编号 */
+    @Excel(name = "驾校编号")
+    @TableField("school")
+    @ApiModelProperty(value = "驾校编号")
+    private String school;
+
+    /** 驾校名称 */
+    @Excel(name = "驾校名称")
+    @TableField("school_name")
+    @ApiModelProperty(value = "驾校名称")
+    private String schoolName;
+
+    /** 驾校提成 */
+    @Excel(name = "驾校提成")
+    @TableField("school_commission")
+    @ApiModelProperty(value = "驾校提成")
+    private int schoolCommission;
+
+    /** 手机类型 1:苹果 2:安卓 */
+    @Excel(name = "手机类型 1:苹果 2:安卓")
+    @TableField("phone_type")
+    @ApiModelProperty(value = "手机类型 1:苹果 2:安卓")
+    private int phoneType;
 
 
 }

jsjp-service/src/main/java/com/miaxis/wx/domain/WxJsOrder.java

@@ -148,6 +148,34 @@ public class WxJsOrder extends BaseBusinessEntity{
     private String orderStatus;
 
 
-
+    /** 是否分成 */
+    @Excel(name = "是否分成给驾校 0:不分成  1:分成")
+    @TableField("is_share")
+    @ApiModelProperty(value = "是否分成给驾校 0:不分成  1:分成")
+    private int isShare;
+
+    /** 驾校编号 */
+    @Excel(name = "驾校编号")
+    @TableField("school")
+    @ApiModelProperty(value = "驾校编号")
+    private String school;
+
+    /** 驾校名称 */
+    @Excel(name = "驾校名称")
+    @TableField("school_name")
+    @ApiModelProperty(value = "驾校名称")
+    private String schoolName;
+
+    /** 驾校提成 */
+    @Excel(name = "驾校提成")
+    @TableField("school_commission")
+    @ApiModelProperty(value = "驾校提成")
+    private int schoolCommission;
+
+    /** 手机类型 1:苹果 2:安卓 */
+    @Excel(name = "手机类型 1:苹果 2:安卓")
+    @TableField("phone_type")
+    @ApiModelProperty(value = "手机类型 1:苹果 2:安卓")
+    private int phoneType;
 
 }

jsjp-service/src/main/java/com/miaxis/wx/dto/WxOrderDTO.java

@@ -8,13 +8,12 @@ public class WxOrderDTO {
     private static final long serialVersionUID = 1L;
 
 
-
     @ApiModelProperty(value = "商品字典编码",required = true)
     private Long dictCode;
 
-
     @ApiModelProperty(value = "用户id",required = true)
     private Long userId;
 
-
+    @ApiModelProperty(value = "手机类型",required = true)
+    private Long phoneType;  // 1苹果 2安卓
 }