收款表导出增加超级会员款/二手上架款

src/main/java/com/caimei/modules/order/dao/CmDiscernReceiptDao.java

@@ -91,4 +91,8 @@ public interface CmDiscernReceiptDao extends CrudDao<CmDiscernReceipt> {
     String getUserNameByUserId(Integer userId);
 
     ReceiptVipInfoVo getReceiptVipInfo(String receiptID);
+
+    List<CmMainReceiptExport> svipReceipt(CmDiscernReceipt cmDiscernReceipt);
+
+    List<CmMainReceiptExport> secondReceipt(CmDiscernReceipt cmDiscernReceipt);
 }

src/main/java/com/caimei/modules/order/service/CmDiscernReceiptService.java

@@ -391,4 +391,14 @@ public class CmDiscernReceiptService extends CrudService<CmDiscernReceiptDao, Cm
         List<CmMainReceiptExport> list = cmDiscernReceiptDao.theOrder(cmDiscernReceipt);
         return list;
     }
+
+    public List<CmMainReceiptExport> svipReceipt(CmDiscernReceipt cmDiscernReceipt) {
+        List<CmMainReceiptExport> list = cmDiscernReceiptDao.svipReceipt(cmDiscernReceipt);
+        return list;
+    }
+
+    public List<CmMainReceiptExport> secondReceipt(CmDiscernReceipt cmDiscernReceipt) {
+        List<CmMainReceiptExport> list = cmDiscernReceiptDao.secondReceipt(cmDiscernReceipt);
+        return list;
+    }
 }

src/main/java/com/caimei/modules/order/web/CmDiscernReceiptController.java

@@ -293,6 +293,23 @@ public class CmDiscernReceiptController extends BaseController {
                 purchase.setPayType(payType);
             }
 
+            //超级会员款
+            List<CmMainReceiptExport> svipList = cmDiscernReceiptService.svipReceipt(cmDiscernReceipt);
+            for (CmMainReceiptExport export : svipList) {
+                export.setOrderID("超级会员款");
+                export.setPayType(OrderUtil.getPayTypeStr(export.getPayType()));
+                list.add(export);
+            }
+
+            //二手商品上架费
+            List<CmMainReceiptExport> secondList = cmDiscernReceiptService.secondReceipt(cmDiscernReceipt);
+            for (CmMainReceiptExport export : secondList) {
+                export.setOrderID("二手商品上架费");
+                export.setUserName("");
+                export.setPayType(OrderUtil.getPayTypeStr(export.getPayType()));
+                list.add(export);
+            }
+
             //	收款进度  1待收  2部分收  3全收
             cmDiscernReceipt.setReceiptProgress("2");
             List<CmReceiptExportData> ListExportData1 = getListExportData(cmDiscernReceipt);

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

@@ -184,6 +184,7 @@
             <if test="receiptProgress != null and receiptProgress != ''">
                 AND o.receiptStatus = #{receiptProgress}
             </if>
+            AND d.receiptType = 1
             AND d.receiptStatus = 3
             AND d.delFlag = '0'
             AND r.delFlag = '0'
@@ -913,4 +914,43 @@
         where cror.receiptID=#{receiptID}
         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
+        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
+        <where>
+            <if test="startTime != null and startTime != ''">
+                AND (d.receiptDate <![CDATA[  >  ]]> #{startTime} OR d.receiptDate = #{startTime})
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND (d.receiptDate <![CDATA[  <  ]]> #{endTime} OR d.receiptDate = #{endTime})
+            </if>
+            AND d.receiptStatus = 3
+            AND d.receiptType = 6
+            AND d.delFlag = '0'
+        </where>
+        ORDER BY d.receiptDate DESC;
+    </select>
+
+    <select id="secondReceipt" resultType="com.caimei.modules.order.entity.CmMainReceiptExport">
+        SELECT d.receiptDate, d.payType, IFNULL(d.receiptAmount, 0) AS associateAmount
+        , d.receiptType
+        FROM cm_discern_receipt d
+        <where>
+            <if test="startTime != null and startTime != ''">
+                AND (d.receiptDate <![CDATA[  >  ]]> #{startTime} OR d.receiptDate = #{startTime})
+            </if>
+            <if test="endTime != null and endTime != ''">
+                AND (d.receiptDate <![CDATA[  <  ]]> #{endTime} OR d.receiptDate = #{endTime})
+            </if>
+            AND d.receiptStatus = 3
+            AND d.receiptType = 7
+            AND d.delFlag = '0'
+        </where>
+        ORDER BY d.receiptDate DESC;
+    </select>
+
 </mapper>