update 修改财务管理下载、订单下载的方式

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentPaymentOrderExportDto.java

@@ -70,6 +70,12 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
     //分润余额
     private BigDecimal routeBalance;
 
+    //分润中的销售费用
+    private BigDecimal saleAmount = BigDecimal.ZERO;
+
+    //分润中的服务费用
+    private BigDecimal serviceAmount = BigDecimal.ZERO;
+
     private String feeFlag;
 
     public BigDecimal getSporadicAmount() {
@@ -287,4 +293,20 @@ public class StudentPaymentOrderExportDto extends StudentPaymentOrder {
     public void setFeeFlag(String feeFlag) {
         this.feeFlag = feeFlag;
     }
+
+    public BigDecimal getSaleAmount() {
+        return saleAmount;
+    }
+
+    public void setSaleAmount(BigDecimal saleAmount) {
+        this.saleAmount = saleAmount;
+    }
+
+    public BigDecimal getServiceAmount() {
+        return serviceAmount;
+    }
+
+    public void setServiceAmount(BigDecimal serviceAmount) {
+        this.serviceAmount = serviceAmount;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ManagerDownload.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.ExportTypeEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.util.Date;
@@ -28,6 +29,12 @@ public class ManagerDownload {
     private String fileUrl;
 
     /**
+     * 文件类型
+     */
+    @ApiModelProperty(value = "文件类型")
+    private ExportTypeEnum type;
+
+    /**
      * 状态
      */
     @ApiModelProperty(value = "状态")
@@ -100,4 +107,12 @@ public class ManagerDownload {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public ExportTypeEnum getType() {
+        return type;
+    }
+
+    public void setType(ExportTypeEnum type) {
+        this.type = type;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/ExportTypeEnum.java

@@ -0,0 +1,27 @@
+package com.ym.mec.biz.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum ExportTypeEnum implements BaseEnum<Integer, ExportTypeEnum> {
+	ORDER(1, "订单列表"),
+	ROUTE_ORDER(2, "财务管理");
+
+	private Integer code;
+
+	private String desc;
+
+	private ExportTypeEnum(Integer code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	@Override
+	public Integer getCode() {
+		return code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ManagerDownloadQueryInfo.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.page;
 
 
+import com.ym.mec.biz.dal.enums.ExportTypeEnum;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -9,6 +10,9 @@ public class ManagerDownloadQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "用户id", required = false)
     private Integer userId = 0;
 
+    @ApiModelProperty(value = "文件类型", required = false)
+    private ExportTypeEnum type;
+
     public Integer getUserId() {
         return userId;
     }
@@ -16,4 +20,12 @@ public class ManagerDownloadQueryInfo extends QueryInfo {
     public void setUserId(Integer userId) {
         this.userId = userId;
     }
+
+    public ExportTypeEnum getType() {
+        return type;
+    }
+
+    public void setType(ExportTypeEnum type) {
+        this.type = type;
+    }
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ExportServiceImpl.java

@@ -445,6 +445,7 @@ public class ExportServiceImpl implements ExportService {
             row.setPaymentChannel(paymentChannel);
             row.setId(i);
             i++;
+
         }
 
         String basePath = new ApplicationHome(this.getClass()).getSource().getParentFile().getPath();

mec-biz/src/main/resources/config/mybatis/ManagerDownloadMapper.xml

@@ -8,6 +8,7 @@
         <result column="user_id_" property="userId"/>
         <result column="name_" property="name"/>
         <result column="file_url_" property="fileUrl"/>
+        <result column="type_" property="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="status_" property="status"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
@@ -26,10 +27,10 @@
     <insert id="insert" keyColumn="id_" keyProperty="id" parameterType="com.ym.mec.biz.dal.entity.ManagerDownload"
             useGeneratedKeys="true">
         <!--@mbg.generated-->
-        insert into manager_download (user_id_, name_, file_url_,
+        insert into manager_download (user_id_, name_, file_url_,type_,
         status_, create_time_, update_time_
         )
-        values (#{userId}, #{name}, #{fileUrl},
+        values (#{userId}, #{name}, #{fileUrl},#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{status}, #{createTime}, #{updateTime}
         )
     </insert>
@@ -75,6 +76,9 @@
             <if test="userId != null">
                 AND user_id_ = #{userId}
             </if>
+            <if test="type != null">
+                AND type_ = #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+            </if>
         </where>
     </sql>
 </mapper>

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -497,6 +497,9 @@
         <result column="routeMerNo" property="routeMerNo"/>
         <result column="routeAmount" property="routeAmount"/>
         <result column="routeBalance" property="routeBalance"/>
+        <result column="sale_amount_" property="saleAmount"/>
+        <result column="service_amount_" property="serviceAmount"/>
+        <result column="routeBalance" property="routeBalance"/>
         <result column="feeFlag" property="feeFlag"/>
         <collection property="orderDetailList" ofType="com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail">
             <result column="detail_id_" property="id"/>

mec-biz/src/main/resources/config/mybatis/StudentPaymentRouteOrderMapper.xml

@@ -285,7 +285,7 @@
         SELECT spo.*,u.username_,spod.id_ detail_id_,spod.type_ detail_type_,spod.price_
         detail_price_,spod.kit_group_purchase_type_ detail_kit_group_purchase_type_,
         sci.charge_type_,g.id_ goods_id, g.name_ goods_name,o.name_ organ_name,spro.route_amount_
-        routeAmount,spro.route_balance_amount_ routeBalance,
+        routeAmount,spro.route_balance_amount_ routeBalance,spro.sale_amount_,spro.service_amount_,
         spro.mer_no_ routeMerNo,spro.fee_flag_ feeFlag
         FROM student_payment_order spo
         LEFT JOIN student_payment_route_order spro ON spro.order_no_ = spo.order_no_

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -1115,6 +1115,7 @@ public class ExportController extends BaseController {
         String no = idGeneratorService.generatorId("download") + "";
         String fileName = "orderList-" + no + "-" + DateUtil.getDate(nowDate) + ".xls";
         ManagerDownload managerDownload = new ManagerDownload();
+        managerDownload.setType(ExportTypeEnum.ORDER);
         managerDownload.setUserId(sysUser.getId());
         managerDownload.setName(fileName);
         managerDownload.setFileUrl("");
@@ -2051,6 +2052,7 @@ public class ExportController extends BaseController {
         String no = idGeneratorService.generatorId("download") + "";
         String fileName = "routeOrderList-" + no + "-" + DateUtil.getDate(nowDate) + ".xls";
         ManagerDownload managerDownload = new ManagerDownload();
+        managerDownload.setType(ExportTypeEnum.ROUTE_ORDER);
         managerDownload.setUserId(sysUser.getId());
         managerDownload.setName(fileName);
         managerDownload.setFileUrl("");