订单下载：增加将客诉的收费信息一起下载

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/SalesOrder.java

@@ -195,6 +195,17 @@ public class SalesOrder implements Serializable {
 
     private Integer trackingAdminId;//跟踪信息 操作人id
 
+    // 维修收费
+    private Integer feeCharges;
+
+    public Integer getFeeCharges() {
+        return feeCharges;
+    }
+
+    public void setFeeCharges(Integer feeCharges) {
+        this.feeCharges = feeCharges;
+    }
+
     public Integer getSalesOldOrderStatus() {
         return salesOldOrderStatus;
     }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -1690,6 +1690,7 @@
         SELECT
             t.*,
             soi.*,
+            temp.feeCharges feeCharges,
             cpm.proc_method_name,
             cpt.proc_type_name,
             trsc.company_name companyName,
@@ -1704,6 +1705,9 @@
         LEFT JOIN tb_rst_cm_relation cr ON ci.customer_id = cr.customer_id
         LEFT JOIN tb_rst_cm_proc_method cpm ON cr.proc_method_id = cpm.proc_method_id
         LEFT JOIN tb_rst_cm_proc_type cpt ON cpm.proc_type_id = cpt.proc_type_id
+        LEFT JOIN (
+            SELECT relation_id, SUM(fee_charges) "feeCharges" FROM tb_rst_fee_information_info GROUP BY relation_id
+        ) temp on temp.relation_id = cr.relation_id
       <where>
             t.sales_batch_id != 'KS00000000000001'
           <if test="salesIsDownload !=null ">

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -793,6 +793,7 @@ public class AdminOrderController {
         titles.add("订单编号");
         titles.add("交易号");
         titles.add("订单类型");
+        titles.add("维修收费");
         titles.add("姓名");
         titles.add("电话");
         titles.add("省");

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/DownOrderRunnable.java

@@ -52,9 +52,11 @@ public class DownOrderRunnable implements Runnable {
                 row.add(salesOrder.getSalesDealCode());
                 if(salesOrder.getSalesCustomerId() == null){
                     row.add("正常订单");
+                    row.add(null);
                 }else{
                     String typeName = salesOrder.getProcTypeName() == null ? "":salesOrder.getProcTypeName();
                     row.add("售后订单（"+  typeName +"）");
+                    row.add(salesOrder.getFeeCharges() == null ? null : salesOrder.getFeeCharges() / 100.0);
                 }
                 row.add(salesOrder.getSalesAddressName());
                 row.add(salesOrder.getSalesAddressTel());