更新对账判断类型和渠道

xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcHistoryOrderMapper.java

@@ -37,5 +37,6 @@ public interface XhpcHistoryOrderMapper {
 
     List<XhpcHistoryOrderDomain> findListByTimeBetween(@Param("startTime") String startTime,
                                                        @Param("endTime")String endTime,
+                                                       @Param("chargingMode") String chargingMode,
                                                        @Param("tenantId")String tenantId);
 }

xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcRechargeOrderMapper.java

@@ -18,6 +18,7 @@ public interface XhpcRechargeOrderMapper {
 
     List<Map<String, Object>> findListByTimeBetween(@Param("startTime") String startTime,
                                                     @Param("endTime") String endTime,
+                                                    @Param("type") Integer type,
                                                     @Param("tenantId") String tenantId);
 
 }

xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/mapper/XhpcRefundOrderMapper.java

@@ -18,6 +18,7 @@ public interface XhpcRefundOrderMapper  {
 
     List<Map<String, Object>> findListByTimeBetween(@Param("startTime") String startTime,
                                                     @Param("endTime") String endTime,
+                                                    @Param("type") Integer type,
                                                     @Param("tenantId") String tenantId);
 
 }

xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/InternetBillServiceImpl.java

@@ -282,7 +282,7 @@ public class InternetBillServiceImpl implements InternetBillService {
 //            getHistoryOrderInfo(domain);
             checkRecordDomainList.add(domain);
         }
-        getHistoryOrderList(checkRecordDomainList, serialNumberList, startTime, endTime, tenantId);
+        getHistoryOrderList(checkRecordDomainList, serialNumberList, "2", startTime, endTime, tenantId);
 
         return checkRecordDomainList;
     }
@@ -355,7 +355,7 @@ public class InternetBillServiceImpl implements InternetBillService {
 //
             checkRecordDomainList.add(domain);
         }
-        getHistoryOrderList(checkRecordDomainList, serialNumberList, startTime, endTime, tenantId);
+        getHistoryOrderList(checkRecordDomainList, serialNumberList, "4", startTime, endTime, tenantId);
         return checkRecordDomainList;
     }
 
@@ -422,7 +422,7 @@ public class InternetBillServiceImpl implements InternetBillService {
 //            getHistoryOrderInfo(domain);
             checkRecordDomainList.add(domain);
         }
-        getHistoryOrderList(checkRecordDomainList, serialNumberList, startTime, endTime, tenantId);
+        getHistoryOrderList(checkRecordDomainList, serialNumberList, "3", startTime, endTime, tenantId);
         return checkRecordDomainList;
     }
 
@@ -493,7 +493,7 @@ public class InternetBillServiceImpl implements InternetBillService {
             serialNumberList.add(domain.getInternetSerialNumber());
             checkRecordDomainList.add(domain);
         }
-        getHistoryOrderList(checkRecordDomainList, serialNumberList, startTime, endTime, tenantId);
+        getHistoryOrderList(checkRecordDomainList, serialNumberList, "1", startTime, endTime, tenantId);
         return checkRecordDomainList;
     }
 
@@ -584,10 +584,10 @@ public class InternetBillServiceImpl implements InternetBillService {
 
 
     private List<XhpcTradebillInternetCheckRecordDomain> getHistoryOrderList(List<XhpcTradebillInternetCheckRecordDomain> domainList,
-                                                                             List<String> serialNumberList,
+                                                                             List<String> serialNumberList, String chargingMode,
                                                                              String startTime, String endTime, String tenantId) {
 
-        List<XhpcHistoryOrderDomain> orderDomainList = historyOrderMapper.findListByTimeBetween(startTime, endTime, tenantId);
+        List<XhpcHistoryOrderDomain> orderDomainList = historyOrderMapper.findListByTimeBetween(startTime, endTime, chargingMode, tenantId);
         Map<String, XhpcHistoryOrderDomain> orderDomainMap = new HashMap<>();
         for (XhpcHistoryOrderDomain orderDomain : orderDomainList) {
             orderDomainMap.put(orderDomain.getInternetSerialNumber(), orderDomain);

xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/service/impl/PaymentBillServiceImpl.java

@@ -196,7 +196,7 @@ public class PaymentBillServiceImpl implements PaymentBillService {
                         }
                         paymentCheckRecordDomainList.add(domain);
                     }
-                    getPlatOrderData(paymentCheckRecordDomainList, orderType, serialNumberList, startTime, endTime, tenantId);
+                    getPlatOrderData(paymentCheckRecordDomainList, orderType, serialNumberList, 2, startTime, endTime, tenantId);
 
                     break;
                 case "ZIP":
@@ -318,7 +318,7 @@ public class PaymentBillServiceImpl implements PaymentBillService {
 
                     paymentCheckRecordDomainList.add(computeTradebillData(domain));
                 }
-                getPlatOrderData(paymentCheckRecordDomainList, orderType, serialNumberList, startTime, endTime, tenantId);
+                getPlatOrderData(paymentCheckRecordDomainList, orderType, serialNumberList, 1, startTime, endTime, tenantId);
 
             } else {
                 throw new Exception("暂不支持的文件格式");
@@ -396,15 +396,16 @@ public class PaymentBillServiceImpl implements PaymentBillService {
     private List<XhpcTradebillPaymentCheckRecordDomain> getPlatOrderData(List<XhpcTradebillPaymentCheckRecordDomain> domainList,
                                                                          int orderType,
                                                                          List<String> serialNumberList,
+                                                                         Integer type,
                                                                          String startTime,
                                                                          String endTime,
                                                                         String tenantId){
 
         List<Map<String, Object>> orderMapList = null;
         if (orderType == 1) {
-            orderMapList = rechargeOrderMapper.findListByTimeBetween(startTime, endTime, tenantId);
+            orderMapList = rechargeOrderMapper.findListByTimeBetween(startTime, endTime, type, tenantId);
         } else if (orderType == 2) {
-            orderMapList = refundOrderMapper.findListByTimeBetween(startTime, endTime, tenantId);
+            orderMapList = refundOrderMapper.findListByTimeBetween(startTime, endTime,type, tenantId);
         }
 
         Map<String, Map<String, Object>> orderList = new HashMap<>();

xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcHistoryOrderMapper.xml

@@ -191,13 +191,16 @@
         from xhpc_history_order ho
         left join xhpc_charging_station s on ho.charging_station_id=s.charging_station_id
         left join xhpc_charge_order c on ho.charge_order_id=c.charge_order_id
-        where ho.tenant_id=#{tenantId}
+        where ho.del_flag =0 and ho.source=1 and ho.tenant_id=#{tenantId}
         <if test="startTime!=null and startTime != ''">
             and ho.create_time <![CDATA[ >= ]]> #{startTime}
         </if>
         <if test="endTime != null and endTime !=''">
             and ho.create_time <![CDATA[ <= ]]> #{endTime}
         </if>
+        <if test="chargingMode != null and chargingMode !=''">
+            and ho.charging_mode=#{chargingMode}
+        </if>
     </select>
 
 

xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcRechargeOrderMapper.xml

@@ -61,6 +61,9 @@
           <if test="endTime != null and endTime !=''">
               and create_time <![CDATA[ <= ]]> #{endTime}
           </if>
+        <if test="type != null">
+            and type=#{type}
+        </if>
     </select>
 
 </mapper>

xhpc-modules/xhpc-activity/src/main/resources/mapper/XhpcRefundOrderMapper.xml

@@ -57,5 +57,8 @@
         <if test="endTime != null and endTime !=''">
             and create_time <![CDATA[ <= ]]> #{endTime}
         </if>
+        <if test="type != null">
+            and type=#{type}
+        </if>
     </select>
 </mapper>