提交代码

Mall.WebApi/Controllers/AppletWeChat/LiveHouseController.cs

@@ -151,7 +151,9 @@ namespace Mall.WebApi.Controllers.AppletWeChat
                 // item.ALLCommission = item.CostFreight + item.CostMoney + item.PackingMoney + item.GoodsFreight + item.OneCommission + item.TwoCommission + item.OtherPrice;
                 item.ALLCommission = item.CostFreight + item.CostMoney + item.PackingMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.OtherPrice;
                 item.NoPaid = item.ALLCommission;
-                item.Paid = item.PaidCostMoney + item.RemitFXCommission + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0);
+
+                item.RemitFXCommission = item.RemitFXCommission + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0);
+                item.Paid = item.PaidCostMoney + item.RemitFXCommission ;
                 item.GrossProfit = (item.AllPrice + item.RealMoney) - item.CouponMoney - item.RefundActual - item.ALLCommission - item.PayMoney;
                 item.GrossProfitRate = (item.AllPrice + item.RealMoney) == 0 ? 0 : Math.Round((item.GrossProfit / (item.AllPrice + item.RealMoney - item.RefundActual)), 2, MidpointRounding.AwayFromZero);
             }
@@ -356,7 +358,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
                     // item.ALLCommission = item.CostFreight + item.CostMoney + item.PackingMoney + item.GoodsFreight + item.OneCommission + item.TwoCommission + item.OtherPrice;
                     item.ALLCommission = item.CostFreight + item.CostMoney + item.PackingMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.OtherPrice;
                     item.NoPaid = item.ALLCommission;
-                    item.Paid = item.PaidCostMoney + item.RemitFXCommission +  (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0);
+                    item.RemitFXCommission = item.RemitFXCommission + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0);
+                    item.Paid = item.PaidCostMoney + item.RemitFXCommission;
                     item.GrossProfit = (item.AllPrice + item.RealMoney) - item.CouponMoney - item.RefundActual - item.ALLCommission - item.PayMoney;
                     item.GrossProfitRate = (item.AllPrice + item.RealMoney) == 0 ? 0 : Math.Round((item.GrossProfit / (item.AllPrice + item.RealMoney - item.RefundActual)), 2, MidpointRounding.AwayFromZero);
                     //item.GrossProfit = item.AllPrice - item.ALLCommission;
@@ -507,7 +510,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
                 item.ALLCommission = item.CostFreight + item.CostMoney + item.PackingMoney + item.GoodsFreight + item.FXCommission + item.LiveCommission + item.OtherPrice;
                 // item.ALLCommission = item.CostFreight + item.CostMoney + item.PackingMoney + item.GoodsFreight + item.OneCommission + item.TwoCommission + item.OtherPrice;
                 item.NoPaid = item.ALLCommission;
-                item.Paid = item.PaidCostMoney + item.RemitFXCommission  + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0);
+                item.RemitFXCommission = item.RemitFXCommission + (!string.IsNullOrWhiteSpace(item.LiveFinanceIds) ? item.LiveCommission : 0);
+                item.Paid = item.PaidCostMoney + item.RemitFXCommission;
                 item.GrossProfit = (item.AllPrice + item.RealMoney) - item.CouponMoney - item.RefundActual - item.ALLCommission - item.PayMoney;
                 item.GrossProfitRate = (item.AllPrice + item.RealMoney) == 0 ? 0 : Math.Round((item.GrossProfit / (item.AllPrice + item.RealMoney - item.RefundActual)), 2, MidpointRounding.AwayFromZero);
                 //item.GrossProfit = item.AllPrice - item.ALLCommission;

Mall.WebApi/Controllers/User/AppletLoginController.cs

@@ -242,7 +242,7 @@ namespace Mall.WebApi.Controllers.User
                     SuperiorId = umodel.SuperiorId ?? 0,
                     Token = token,
                     SmallShopId =(smallShopsInfoModle != null && smallShopsInfoModle.AuditStatus == DistributorAuditStatusEnum.Audited) ? smallShopsInfoModle.Id : 0,
-                    UserSmallShopId = demodel.SmallShopId
+                    UserSmallShopId = umodel.SmallShopId
                 };
                 UserReidsCache.AppletUserInfoSet(UserModuleCacheKeyConfig.Applet_Login_Info + umodel.Id, appletUserInfo, Config.JwtExpirTime);
                 return ApiResult.CouponSuccess(ResultCode.Fail, "", "", appletUserInfo);

Mall.WebApi/Controllers/User/AppletUserController.cs

@@ -951,7 +951,7 @@ namespace Mall.WebApi.Controllers.User
             demodel.UserId = userInfo.UserId;
             demodel.TenantId = userInfo.TenantId;
             demodel.MallBaseId = userInfo.MallBaseId;
-            demodel.SmallShopId = userInfo.SmallShopId;
+            demodel.SmallShopId = userInfo.UserSmallShopId;
             var list = couponModule.GetAllCouponList(pagelist.pageIndex, pagelist.pageSize, out long count, demodel);
             pagelist.count = Convert.ToInt32(count);
             pagelist.pageData = list.Select(x => new