提交代码

Mall.Module.Product/GuideCarModule.cs

@@ -160,7 +160,7 @@ namespace Mall.Module.Product
         /// <param name="rowCount">总条数</param>
         /// <param name="query">查询条件</param>
         /// <returns></returns>
-        public List<RB_GuideCar_Site_Extend> GetLogisticsPinkageList(int pageIndex, int pageSize, out long rowCount, RB_GuideCar_Site_Extend query)
+        public List<RB_GuideCar_Site_Extend> GetGuideCarSiteList(int pageIndex, int pageSize, out long rowCount, RB_GuideCar_Site_Extend query)
         {
             List<RB_GuideCar_Site_Extend> list = SiteRepository.GetPageListRepository(pageIndex, pageSize, out rowCount, query);
             if (list != null && list.Any())
@@ -180,7 +180,7 @@ namespace Mall.Module.Product
         /// </summary>
         /// <param name="query"></param>
         /// <returns></returns>
-        public RB_GuideCar_Site_Extend GetPinkageModel(RB_GuideCar_Site_Extend query)
+        public RB_GuideCar_Site_Extend GetGuideCarSiteModel(RB_GuideCar_Site_Extend query)
         {
             RB_GuideCar_Site_Extend model = SiteRepository.GetLogisticsRulesList(query).FirstOrDefault();
             if (model != null)

Mall.WebApi/Controllers/AppletWeChat/LiveHouseController.cs

@@ -152,6 +152,12 @@ namespace Mall.WebApi.Controllers.AppletWeChat
 
             foreach (var item in list)
             {
+                if (item.OrderStatus == 7)
+                {
+                    item.FXCommission = 0;
+                    item.LiveCommission = 0;
+                    item.RemitFXCommission = 0;
+                }
                 item.ALLCommission = item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.CouponMoney + item.RefundActual + item.YFMoney;
                 item.NoPaid = item.ALLCommission;
                 item.RemitFXCommission = item.RemitFXCommission + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0);
@@ -364,7 +370,12 @@ namespace Mall.WebApi.Controllers.AppletWeChat
                 }
                 foreach (var item in list)
                 {
-                   
+                    if (item.OrderStatus == 7)
+                    {
+                        item.FXCommission = 0;
+                        item.LiveCommission = 0;
+                        item.RemitFXCommission = 0;
+                    }
                     item.ALLCommission = item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.CouponMoney + item.RefundActual + item.YFMoney;
                     item.NoPaid = item.ALLCommission;
                     item.RemitFXCommission = item.RemitFXCommission + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0);
@@ -567,8 +578,12 @@ namespace Mall.WebApi.Controllers.AppletWeChat
             }
             foreach (var item in list)
             {
-               
-               
+                if (item.OrderStatus == 7)
+                {
+                    item.FXCommission = 0;
+                    item.LiveCommission = 0;
+                    item.RemitFXCommission = 0;
+                }
                 item.ALLCommission = item.CostMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.CouponMoney + item.RefundActual + item.YFMoney;
                 item.NoPaid = item.ALLCommission;
                 item.RemitFXCommission = item.RemitFXCommission + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0);