排除erp订单

Mall.WindowsService/Module/FinanceModule.cs

@@ -185,7 +185,7 @@ namespace Mall.WindowsService.Module
                             {
                                 StringBuilder builder = new StringBuilder();
                                 builder.AppendFormat($@" SELECT a.*,b.OrderNo from rb_goods_orderdetail as a LEFT JOIN rb_goods_order as b on a.OrderId=b.OrderId
-where b.TenantId={item.TenantId} and b.MallBaseId={item.MallBaseId}  and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')>= DATE_FORMAT('{startDate}','%y-%m-%d') 
+where b.TenantId={item.TenantId} and b.MallBaseId={item.MallBaseId} and b.OrderSource!=6  and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')>= DATE_FORMAT('{startDate}','%y-%m-%d') 
 and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') AND b.OrderStatus IN (2, 3, 4, 5, 6) ");
                                 //                                builder.AppendFormat($@" SELECT a.*,b.OrderNo from rb_goods_orderdetail as a LEFT JOIN rb_goods_order as b on a.OrderId=b.OrderId
                                 //where b.TenantId={item.TenantId} and b.MallBaseId={item.MallBaseId}  and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')>= DATE_FORMAT('{startDate}','%y-%m-%d') 
@@ -366,7 +366,7 @@ and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
             catch (Exception ex)
             {
                 string str = financeConfigurineRepository.ConnectionStr;
-                Helper.LogHelper.Write("数据库连接1：" + str+"错误日志"+ ex.Message);
+                Helper.LogHelper.Write("数据库连接1：" + str + "错误日志" + ex.Message);
             }
 
             return flag;
@@ -858,7 +858,7 @@ and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
                         //更新微店返佣
                         var ssList = smallShops_CommissionRepository.GetList(new RB_SmallShops_Commission_Extend() { TenantId = tenantId, MallBaseId = mallBaseId, OrderId = orderModel.OrderId });
                         if (ssList.Where(x => x.CommissionState == 1).Any())
-                        {                            
+                        {
                             //验证是否是自动结算
                             var ssbaseModel = microShop_BasicsRepository.GetMicroShopBasicsList(new RB_MicroShop_Basics() { TenantId = tenantId, MallBaseId = mallBaseId }).FirstOrDefault();
                             if (("," + (ssbaseModel?.SettlementType ?? "") + ",").Contains("," + ((int)DistrbutorWithdrawWayEnum.ZDXJ).ToString() + ","))
@@ -905,7 +905,7 @@ and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
                                         var flagpay = false;
                                         if (IsNormalServer == 1)
                                         {
-                                            flagpay = PayUtil.GetTransfersOrder(OrderNum, RemitMoney, (ssmodel.UserId ?? 0).ToString(), umodel.OpenId, minModel, "赞羊微店佣金打款");                                            
+                                            flagpay = PayUtil.GetTransfersOrder(OrderNum, RemitMoney, (ssmodel.UserId ?? 0).ToString(), umodel.OpenId, minModel, "赞羊微店佣金打款");
                                         }
                                         if (flagpay)
                                         {
@@ -2149,10 +2149,12 @@ and  DATE_FORMAT(b.PaymentTime,'%y-%m-%d')<DATE_FORMAT('{endDate}','%y-%m-%d') A
                     var detailList = new List<object>();
                     #region 查询所有的订单
                     List<RB_ECFinanceId_Relation> ECList = new List<RB_ECFinanceId_Relation>();
-                    if (oList.Any()) {
+                    if (oList.Any())
+                    {
                         string orderids = string.Join(",", oList.Select(x => x.OrderId));
                         var dlist = goodsOrderDetailRepository.GetOrderDetailList(new RB_Goods_OrderDetail_Extend() { OrderIds = orderids });
-                        foreach (var qitem in dlist) {
+                        foreach (var qitem in dlist)
+                        {
                             ECList.Add(new RB_ECFinanceId_Relation()
                             {
                                 ECOrderId = qitem.OrderId,