1

src/main/java/com/fdkankan/manage/entity/DownloadOrderMg.java

@@ -161,6 +161,11 @@ public class DownloadOrderMg implements Serializable {
      */
     @TableField("remark")
     private String remark;
+    /**
+     * 下载类型 0看看，1深时
+     */
+    @TableField("down_type")
+    private Integer downType;
 
 
 }

src/main/java/com/fdkankan/manage/vo/response/DownOrderVo.java

@@ -24,6 +24,38 @@ public class DownOrderVo {
     @ExcelProperty("用户账号")
     private String userName;                //用户账号
 
+    @ExcelProperty("客户名称")
+    private String customerName;
+
+    /**
+     * 客户类别0直销，1经销
+     */
+    @ExcelIgnore
+    private Integer customerType;
+
+    @ExcelProperty("客户类别")
+    private String customerTypeStr;
+
+    @ExcelProperty("终端客户")
+    private String endCustomer;
+
+    @ExcelProperty("经销商名称")
+    private String agentName;
+
+    @ExcelIgnore
+    private Integer useType;
+
+    @ExcelProperty("使用类型")
+    private String useTypeStr;
+
+
+    @ExcelIgnore
+    private Integer downType;
+
+    @ExcelProperty("下载类型")
+    private String downTypeStr;
+
+
     @ExcelProperty("相机sn码")
     private String snCode;             //相机sn码
 
@@ -48,29 +80,6 @@ public class DownOrderVo {
     @ExcelIgnore
     private Integer timeZoneOff;
 
-    @ExcelProperty("客户名称")
-    private String customerName;
-
-    /**
-     * 客户类别0直销，1经销
-     */
-    @ExcelIgnore
-    private Integer customerType;
-
-    @ExcelProperty("客户类别")
-    private String customerTypeStr;
-
-    @ExcelProperty("终端客户")
-    private String endCustomer;
-
-    @ExcelIgnore
-    private Integer useType;
-
-    @ExcelProperty("使用类型")
-    private String useTypeStr;
-
-    @ExcelProperty("经销商名称")
-    private String agentName;
 
     @ExcelProperty("充值方式")
     private String payMethod;
@@ -137,4 +146,15 @@ public class DownOrderVo {
             default: return "";
         }
     }
+
+    public String getDownTypeStr() {
+        if(downType == null){
+            return "";
+        }
+        switch (downType){
+            case 0 : return "四维看看";
+            case 1 : return "四维深时";
+            default: return "";
+        }
+    }
 }

src/main/java/com/fdkankan/manage/vo/response/IncrementOrderVo.java

@@ -27,29 +27,10 @@ public class IncrementOrderVo {
     @ExcelProperty("用户账号")
     private String userName;                //用户账号
 
-    @ExcelProperty("客户名称")
+    @ExcelIgnore
     private String nickName;                //昵称
 
-    @ExcelProperty("订单金额")
-    private BigDecimal amount;              //订单金额
-
-    @ExcelProperty("数量")
-    private BigDecimal count;             //数量
 
-    @ExcelProperty("支付方式")
-    private String payType;               //支付方式 付款方式，0表示微信，1表示支付宝，2表示paypal，3表示其他，4表示货到付款
-
-    @ExcelProperty("交易号")
-    private String number;                //交易号
-
-    @ExcelProperty("付款状态")
-    private String payStatus;           //付款状态（状态，0或-1表示未付款，-2表示已退款,1表示已付款
-
-    @ExcelIgnore
-    private Integer timeZoneOff;
-
-    @ExcelProperty("权益类型")
-    private String memberLevels;
 
     @ExcelProperty("客户名称")
     private String customerName;
@@ -66,14 +47,41 @@ public class IncrementOrderVo {
     @ExcelProperty("终端客户")
     private String endCustomer;
 
+    @ExcelProperty("经销商名称")
+    private String agentName;
+
     @ExcelIgnore
     private Integer useType;
 
     @ExcelProperty("使用类型")
     private String useTypeStr;
 
-    @ExcelProperty("经销商名称")
-    private String agentName;
+    @ExcelProperty("权益类型")
+    private String memberLevels;
+
+    @ExcelProperty("订单金额")
+    private BigDecimal amount;              //订单金额
+
+    @ExcelProperty("数量")
+    private BigDecimal count;             //数量
+
+    @ExcelProperty("支付方式")
+    private String payType;               //支付方式 付款方式，0表示微信，1表示支付宝，2表示paypal，3表示其他，4表示货到付款
+
+    @ExcelProperty("交易号")
+    private String number;                //交易号
+
+    @ExcelProperty("付款状态")
+    private String payStatus;           //付款状态（状态，0或-1表示未付款，-2表示已退款,1表示已付款
+
+    @ExcelIgnore
+    private Integer timeZoneOff;
+
+    @ExcelProperty("会员服务期限")
+    private String incrementTime;
+
+    @ExcelProperty("SN码")
+    private String snCode;
 
     @ExcelProperty("充值方式")
     private String payMethod;
@@ -90,11 +98,6 @@ public class IncrementOrderVo {
     @ExcelIgnore
     private Date incrementEndTime;
 
-    @ExcelProperty("会员服务期限")
-    private String incrementTime;
-
-    @ExcelProperty("SN码")
-    private String snCode;
 
     public String getPayType() {
         if(payType == null){

src/main/resources/mapper/manage/DownloadOrderMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.DownOrderVo">
         select o.* ,
-               null as customer_name,null as customer_type,null as end_customer,null as use_type ,null as project_num ,null as remark,
+               null as customer_name,null as customer_type,null as end_customer,null as use_type ,null as project_num ,null as remark,null as downType,
                 u.user_name  ,
               '线上' as payMethod
         from  t_download_order o
@@ -14,7 +14,8 @@
             o.rec_status = 'ABC'
         </if>
         union all
-        SELECT o.*,u.user_name ,'线下'as payMethod from t_download_order_mg o
+        SELECT o.*,u.user_name ,'线下'as payMethod
+        from t_download_order_mg o
         left join t_user u on o.user_id = u.id
         <include refid="commonWhere"></include>
         <if test="param.customerType!=null">