Merge branch 'sdzq-ld' of http://gitlab.oytour.com/Kui2/mall.oytour.com

Mall.Module.Product/OrderModule.cs

@@ -3941,6 +3941,10 @@ namespace Mall.Module.Product
                             item.CommentGiveIntegral = Convert.ToInt32((gmodel.IntegralComment ?? 0) * (item.Number ?? 0));
                         }
                     }
+
+                    #region 佣金抵扣
+                    item.Final_Price -= (item.DeductionCommission ?? 0);
+                    #endregion
                 }
             }
             if (demodel.FreightMoney != TotalExpress)

Mall.WebApi/appsettings.json

@@ -28,6 +28,7 @@
   "OpenValidation": "False",
   "UploadSiteUrl": "http://192.168.1.214:8120",
   "ViewFileSiteUrl": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com",
+  "AliFileSiteUrl": "https://vt-im-bucket.oss-cn-chengdu.aliyuncs.com",
   "ImKey": "b612b31e837c79c68f141aeb719d2b20",
   "ImSecret": "66000451fb72",
   "Mongo": "mongodb://47.96.25.130:27017",
@@ -50,10 +51,10 @@
   "ExpendDepartment": 331,
   "RebornDMC": "reborn_dmc",
   "PropertyDB": "test_property",
-  "IncomeFinanceApi": "http://192.168.2.16:8083/api/Mall/InsertFinanceBatchForMallIn",
-  "PaymentFinanceApi": "http://192.168.2.16:8083/api/Mall/InsertFinanceBatchForMallOut",
-  "ZYRefundFinanceApi": "http://192.168.2.16:8083/api/Mall/SetMallOrderSalesTheWayRefund",
-  "PropertyApi": "http://192.168.2.16:8087/api/ECWorkFlow/SetECSuppliesStockInFlow",
+  "IncomeFinanceApi": "http://192.168.2.13:8083/api/Mall/InsertFinanceBatchForMallIn",
+  "PaymentFinanceApi": "http://192.168.2.13:8083/api/Mall/InsertFinanceBatchForMallOut",
+  "ZYRefundFinanceApi": "http://192.168.2.13:8083/api/Mall/SetMallOrderSalesTheWayRefund",
+  "PropertyApi": "http://192.168.2.13:8087/api/ECWorkFlow/SetECSuppliesStockInFlow",
   "FinanceKey": "FinanceMallInsertToERPViitto2020",
   "SettlementRate": "0.60",
   "RabbitMqConfig": {