diff --git a/BBWY.Server.API/appsettings.json b/BBWY.Server.API/appsettings.json index 32c04eef..7da7ac42 100644 --- a/BBWY.Server.API/appsettings.json +++ b/BBWY.Server.API/appsettings.json @@ -11,8 +11,7 @@ //"DB": "data source=rm-bp1508okrh23710yfao.mysql.rds.aliyuncs.com;port=3306;user id=qyroot;password=kaicn1132+-;initial catalog=bbwy;charset=utf8;sslmode=none;" "DB": "data source=rm-bp1508okrh23710yfao.mysql.rds.aliyuncs.com;port=3306;user id=qyroot;password=kaicn1132+-;initial catalog=bbwy_test;charset=utf8;sslmode=none;", "MDSDB": "data source=rm-bp1508okrh23710yfao.mysql.rds.aliyuncs.com;port=3306;user id=qyroot;password=kaicn1132+-;initial catalog=mds;charset=utf8;sslmode=none;", - "JDXX": "data source=rm-bp1508okrh23710yfao.mysql.rds.aliyuncs.com;port=3306;user id=qyroot;password=kaicn1132+-;initial catalog=jdxx;charset=utf8;sslmode=none;", - "QK": "data source=rm-bp1508okrh23710yfao.mysql.rds.aliyuncs.com;port=3306;user id=qyroot;password=kaicn1132+-;initial catalog=qiku;charset=utf8;sslmode=none;" + "JDXX": "data source=rm-bp1508okrh23710yfao.mysql.rds.aliyuncs.com;port=3306;user id=qyroot;password=kaicn1132+-;initial catalog=jdxx;charset=utf8;sslmode=none;" }, "GlobalSetting": { "MdsApi": "http://mdsapi.qiyue666.com", diff --git a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs index a49ff0f3..0809b516 100644 --- a/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs +++ b/BBWY.Server.Business/PurchaseOrderV2/BatchPurchase/BatchPurchaseBusiness.cs @@ -22,18 +22,17 @@ namespace BBWY.Server.Business private ProductBusiness productBusiness; private IEnumerable platformSDKBusinessList; - private FreeSqlMultiDBManager freeSqlMultiDBManager; + public BatchPurchaseBusiness(IFreeSql fsql, NLogManager nLogManager, IIdGenerator idGenerator, ProductBusiness productBusiness, - IEnumerable platformSDKBusinessList, - FreeSqlMultiDBManager freeSqlMultiDBManager) : base(fsql, nLogManager, idGenerator) + IEnumerable platformSDKBusinessList) : base(fsql, nLogManager, idGenerator) { this.productBusiness = productBusiness; this.platformSDKBusinessList = platformSDKBusinessList; - this.freeSqlMultiDBManager = freeSqlMultiDBManager; + } /// @@ -389,32 +388,12 @@ namespace BBWY.Server.Business .ToList(); var purchaseOrderIdList = purchaseOrderList.Select(p => p.Id).ToList(); - - //获取订单 sku 费用 - var orderList = freeSqlMultiDBManager.QKfsql.Select().Where(p => p.IsDeleted == 0) - .LeftJoin((p, f) => p.Id == f.TaskId).Where(d => purchaseOrderIdList.Contains(d.OrderId)).ToList(); - var purchaseOrderSkuList = fsql.Select().Where(posku => purchaseOrderIdList.Contains(posku.PurchaseOrderId)).ToList(); - if (orderList.Count > 0) - purchaseOrderSkuList.ForEach(p => - { - var order = orderList.SingleOrDefault(o => o.OrderId == p.PurchaseOrderId && o.SkuId == p.SkuId); - if (order != null) - p.ConsumableAmount = order.DiscountPrice;//添加耗材费用 - }); - foreach (var purchaseOrder in purchaseOrderList) - { purchaseOrder.ItemList = purchaseOrderSkuList.Where(posku => posku.PurchaseOrderId == purchaseOrder.Id).ToList(); - - purchaseOrder.ConsumableAmount = - - purchaseOrderSkuList.Where(posku => posku.PurchaseOrderId == purchaseOrder.Id).Select(p => p.ConsumableAmount).Sum(); - } - return new PurchaseOrderV2ListResponse() { Count = total, ItemList = purchaseOrderList }; }