收款账单数据导出调整

src/main/java/com/caimei/modules/order/entity/CmMainReceiptExport.java

@@ -13,6 +13,7 @@ public class CmMainReceiptExport {
 	private String relationType; //关系类型：1返佣订单（返佣款）、2非返佣订单（订单款或者非订单款）
 	private String receiptAmount; //返佣订单收款金额
 	private String receiptType;		// 收款类型
+	private String bankNameType;	// 收款银行
 
 	public String getReceiptAmount() {
 		return receiptAmount;
@@ -101,4 +102,12 @@ public class CmMainReceiptExport {
 	public void setReceiptType(String receiptType) {
 		this.receiptType = receiptType;
 	}
-}
+
+	public String getBankNameType() {
+		return bankNameType;
+	}
+
+	public void setBankNameType(String bankNameType) {
+		this.bankNameType = bankNameType;
+	}
+}

src/main/resources/mappings/modules/order/CmDiscernReceiptMapper.xml

@@ -264,12 +264,14 @@
         d.receiptDate,
         d.payType,
         IFNULL(r.associateAmount,0) as associateAmount,
+        cof.bankAccount AS bankNameType,
         d.receiptType
         FROM
         cm_receipt_order_relation r
         LEFT JOIN cm_discern_receipt d ON d.id = r.receiptID
         LEFT JOIN cm_order o ON r.orderID = o.orderID
         LEFT JOIN USER u ON u.userID = o.userID
+        LEFT JOIN cm_offline_collection cof ON d.payType = cof.type
         <where>
             <if test="startTime != null and startTime != ''">
                 AND (d.receiptDate <![CDATA[  >=  ]]> #{startTime})
@@ -297,12 +299,14 @@
         d.receiptDate,
         d.payType,
         IFNULL(d.receiptAmount,0) as associateAmount,
+        cof.bankAccount AS bankNameType,
         d.receiptType
         FROM
         cm_receipt_order_relation r
         LEFT JOIN cm_discern_receipt d ON d.id = r.receiptID
         LEFT JOIN cm_shop_order so ON r.orderID = so.shopOrderID
         LEFT JOIN USER u ON u.userID = so.userID
+        LEFT JOIN cm_offline_collection cof ON d.payType = cof.type
         <where>
             <if test="startTime != null and startTime != ''">
                 AND (d.receiptDate <![CDATA[  >=  ]]> #{startTime})
@@ -896,9 +900,10 @@
 	</select>
 
     <select id="exportRefund" resultType="com.caimei.modules.order.entity.CmReturnedPurchase">
-        SELECT bou.name as userName, crp.*
+        SELECT bou.name as userName, cof.bankAccount AS bankNameType, crp.*
         FROM `cm_returned_purchase` crp
         LEFT JOIN bp_order_userinfo bou ON bou.orderId = crp.orderId
+        LEFT JOIN cm_offline_collection cof ON crp.payType = cof.type
         <where>
             <if test="startTime != null and startTime != ''">
                 AND (crp.confirmReturnTime <![CDATA[  >  ]]> #{startTime} OR crp.confirmReturnTime = #{startTime})
@@ -912,9 +917,9 @@
     </select>
 
     <select id="theOrder" resultType="com.caimei.modules.order.entity.CmMainReceiptExport">
-        SELECT d.receiptDate, d.payType, IFNULL(d.receiptAmount, 0) AS associateAmount
-            , d.receiptType
+        SELECT d.receiptDate, d.payType, IFNULL(d.receiptAmount, 0) AS associateAmount, cof.bankAccount AS bankNameType, d.receiptType
         FROM cm_discern_receipt d
+        LEFT JOIN cm_offline_collection cof ON d.payType = cof.type
         <where>
             <if test="startTime != null and startTime != ''">
                 AND (d.receiptDate <![CDATA[  >  ]]> #{startTime} OR d.receiptDate = #{startTime})
@@ -1020,12 +1025,12 @@
         LIMIT 1
     </select>
     <select id="svipReceipt" resultType="com.caimei.modules.order.entity.CmMainReceiptExport">
-        SELECT d.receiptDate, u.userName, d.payType, IFNULL(d.receiptAmount, 0) AS associateAmount
-        , d.receiptType
+        SELECT d.receiptDate, u.userName, d.payType, IFNULL(d.receiptAmount, 0) AS associateAmount, cof.bankAccount AS bankNameType, d.receiptType
         FROM cm_discern_receipt d
         left join cm_receipt_order_relation cror on d.id = cror.receiptID
         left join cm_svip_history csh on cror.vipRecordId = csh.id
         left join user u on csh.userId = u.userID
+        LEFT JOIN cm_offline_collection cof ON d.payType = cof.type
         <where>
             <if test="startTime != null and startTime != ''">
                 AND (d.receiptDate <![CDATA[  >  ]]> #{startTime} OR d.receiptDate = #{startTime})
@@ -1041,9 +1046,9 @@
     </select>
 
     <select id="secondReceipt" resultType="com.caimei.modules.order.entity.CmMainReceiptExport">
-        SELECT d.receiptDate, d.payType, IFNULL(d.receiptAmount, 0) AS associateAmount
-        , d.receiptType
+        SELECT d.receiptDate, d.payType, IFNULL(d.receiptAmount, 0) AS associateAmount, cof.bankAccount AS bankNameType, d.receiptType
         FROM cm_discern_receipt d
+        LEFT JOIN cm_offline_collection cof ON d.payType = cof.type
         <where>
             <if test="startTime != null and startTime != ''">
                 AND (d.receiptDate <![CDATA[  >  ]]> #{startTime} OR d.receiptDate = #{startTime})