1

README.md

@@ -118,3 +118,21 @@
 ~~~~
 
 
+###**v2.7.2**
+~~~~
+
+    会员，下载新增字段
+   companyName;     合同所属公司
+
+   businessDept;    业务部门
+
+    businessName;    业务员
+
+   customerPayTime;   客户付款时间
+   
+   相机授权新增以上，即以下
+    modelAuthCode;    算法授权码
+
+~~~~
+
+

doc/update.2.7.2.sql

@@ -0,0 +1,20 @@
+ALTER TABLE `4dkankan_v4`.`t_download_order_mg`
+    ADD COLUMN `company_name` varchar(255) NULL COMMENT '合同所属公司' AFTER `agent_id`,
+ADD COLUMN `business_dept` varchar(255) NULL COMMENT '业务部门' AFTER `company_name`,
+ADD COLUMN `business_name` varchar(255) NULL COMMENT '业务员' AFTER `business_dept`,
+ADD COLUMN `customer_pay_time` varchar(255) NULL COMMENT '客户付款时间' AFTER `business_name`;
+
+
+ALTER TABLE `4dkankan_v4`.`t_increment_order_mg`
+    ADD COLUMN `company_name` varchar(255) NULL COMMENT '合同所属公司' AFTER `agent_id`,
+ADD COLUMN `business_dept` varchar(255) NULL COMMENT '业务部门' AFTER `company_name`,
+ADD COLUMN `business_name` varchar(255) NULL COMMENT '业务员' AFTER `business_dept`,
+ADD COLUMN `customer_pay_time` varchar(255) NULL COMMENT '客户付款时间' AFTER `business_name`;
+
+
+ALTER TABLE `4dkankan_v4`.`t_authorize_camera`
+    ADD COLUMN `company_name` varchar(255) NULL COMMENT '合同所属公司' AFTER `remark`,
+ADD COLUMN `business_dept` varchar(255) NULL COMMENT '业务部门' AFTER `company_name`,
+ADD COLUMN `business_name` varchar(255) NULL COMMENT '业务员' AFTER `business_dept`,
+ADD COLUMN `customer_pay_time` varchar(255) NULL COMMENT '客户付款时间' AFTER `business_name`,
+ADD COLUMN `model_auth_code` varchar(255) NULL COMMENT '算法授权码' AFTER `customer_pay_time`;

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

@@ -114,6 +114,22 @@ public class AuthorizeCamera implements Serializable {
     @TableField("update_time")
     private Date updateTime;
 
+    @TableField("company_name")
+    private String companyName;
+
+    @TableField("business_dept")
+    private String businessDept;
+
+    @TableField("business_name")
+    private String businessName;
+
+    @TableField("customer_pay_time")
+    private String customerPayTime;
+
+    @TableField("model_auth_code")
+    private String modelAuthCode;
+
+
     @TableField(exist = false)
     private String useTypeStr;
 

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

@@ -176,4 +176,15 @@ public class DownloadOrderMg implements Serializable {
     @TableField("currency_symbol")
     private String currencySymbol;
 
+    @TableField("company_name")
+    private String companyName;
+
+    @TableField("business_dept")
+    private String businessDept;
+
+    @TableField("business_name")
+    private String businessName;
+
+    @TableField("customer_pay_time")
+    private String customerPayTime;
 }

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

@@ -176,4 +176,16 @@ public class IncrementOrderMg implements Serializable {
     @TableField("currency_symbol")
     private String currencySymbol;
 
+    @TableField("company_name")
+    private String companyName;
+
+    @TableField("business_dept")
+    private String businessDept;
+
+    @TableField("business_name")
+    private String businessName;
+
+    @TableField("customer_pay_time")
+    private String customerPayTime;
+
 }

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

@@ -31,6 +31,19 @@ public class DownOrderVo {
     @ExcelProperty("场景码")
     private String sceneNum;             //场景码
 
+    @ExcelProperty("合同所属公司")
+    private String companyName;
+
+    @ExcelProperty("业务部门")
+    private String businessDept;
+
+    @ExcelProperty("业务员")
+    private String businessName;
+
+    @ExcelProperty("客户付款时间")
+    private String customerPayTime;
+
+
     @ExcelProperty("客户名称")
     private String customerName;
 

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

@@ -2,6 +2,7 @@ package com.fdkankan.manage.vo.response;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fdkankan.manage.util.DateUtils;
 import lombok.Data;
 import org.apache.commons.lang3.StringUtils;
@@ -26,6 +27,18 @@ public class IncrementOrderVo {
     @ExcelProperty("用户账号")
     private String userName;                //用户账号
 
+    @ExcelProperty("合同所属公司")
+    private String companyName;
+
+    @ExcelProperty("业务部门")
+    private String businessDept;
+
+    @ExcelProperty("业务员")
+    private String businessName;
+
+    @ExcelProperty("客户付款时间")
+    private String customerPayTime;
+
     @ExcelIgnore
     private String nickName;                //昵称
 

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

@@ -3,9 +3,11 @@
 <mapper namespace="com.fdkankan.manage.mapper.IDownloadOrderMapper">
 
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.DownOrderVo">
-        select o.* ,
+        select o.id,o.order_sn,o.amount,o.number,o.pay_type,o.pay_status,o.status,o.trade_time,o.user_id,o.count,o.abroad,o.create_time,
+               o.rec_status,o.update_time,o.scene_num,o.scene_name,o.time_zone_off,o.currency_symbol,o.agent_key,
                null as customer_name,0 as customer_type,null as end_customer,null as use_type ,null as project_num ,
-               null as remark,null as downType,null as agentName,null as agentId,
+               null as remark,null as downType,null as agentName,null as agentId,null as company_name ,null as business_dept,
+               null as business_name,null as customer_pay_time,
                 u.user_name  ,
               '线上' as payMethod
         from  t_download_order o
@@ -15,7 +17,11 @@
            and  o.rec_status = 'ABC'
         </if>
         union all
-        SELECT o.*,u.user_name ,'线下'as payMethod
+        SELECT  o.id,o.order_sn,o.amount,o.number,o.pay_type,o.pay_status,o.status,o.trade_time,o.user_id,o.count,o.abroad,o.create_time,
+        o.rec_status,o.update_time,o.scene_num,o.scene_name,o.time_zone_off,o.currency_symbol,o.agent_key,
+        o.customer_name,o.customer_type,o.end_customer,o.use_type,o.project_num,o.remark,o.down_type,o.agent_name,o.agent_id,
+        o.company_name,o.business_dept,o.business_name,o.customer_pay_time,
+               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>

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

@@ -5,7 +5,8 @@
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.IncrementOrderVo">
         select o.id,o.trade_time ,o.order_sn,o.member_levels,o.amount,o.count,o.pay_type,o.number,o.pay_status,o.time_zone_off,o.increment_id,o.create_time,
                null as customer_name,0 as customer_type,null as end_customer,null as use_type ,null as project_num ,
-               null as remark,null as agentName,null as agentId,o.currency_symbol,
+               null as remark,null as agentName,null as agentId,o.currency_symbol,null as company_name ,null as business_dept,
+        null as business_name,null as customer_pay_time,
                 u.user_name,u.nick_name,
                '线上' as payMethod
         from  t_increment_order o
@@ -16,7 +17,8 @@
         </if>
         union all
         select o.id,o.trade_time ,o.order_sn,o.member_levels,o.amount,o.count,o.pay_type,o.number,o.pay_status,o.time_zone_off,o.increment_id,o.create_time,
-        o.customer_name,o.customer_type,o.end_customer,o.use_type,o.project_num,o.remark,o.agent_name,o.agent_id,o.currency_symbol,
+        o.customer_name,o.customer_type,o.end_customer,o.use_type,o.project_num,o.remark,o.agent_name,o.agent_id,o.currency_symbol,o.company_name,o.business_dept,
+        o.business_name,o.customer_pay_time,
         u.user_name,u.nick_name ,'线下'as payMethod from t_increment_order_mg o
         left join t_user u on o.user_id = u.id
         <include refid="commonWhere"></include>