1

Mall.Module.User/UserModule.cs

@@ -1376,7 +1376,7 @@ namespace Mall.Module.User
             {
                 //查询最小的代理等级
                 var glist = distributor_HPGradeInfoRepository.GetList(new RB_Distributor_HPGradeInfo_Extend() { TenantId = userInfo.TenantId, MallBaseId = userInfo.MallBaseId });
-                int MinId = glist.Where(x => (x.IsGuest ?? 0) != 1).Min(x => x.Grade ?? 0);
+                int MinId = glist.Where(x => (x.IsGuest ?? 0) != 1).Max(x => x.Grade ?? 0);
                 int MinGradeId = glist.Where(x => x.Grade == MinId).FirstOrDefault()?.Id ?? 0;
                 Dictionary<string, object> keyValues = new Dictionary<string, object>() {
                     { nameof(RB_Distributor_Info.AuditStatus),DistributorAuditStatusEnum.Audited},
@@ -2573,6 +2573,11 @@ namespace Mall.Module.User
             if (CustomModel == null) {
                 return "";
             }
+
+            var basicModel = distributor_BasicsRepository.GetList(new RB_Distributor_Basics_Extend() { TenantId = tenantId, MallBaseId = mallBaseId }).FirstOrDefault();
+            if (basicModel == null) {
+                return "";
+            }
             return new
             {
                 CustomModel = new
@@ -2584,7 +2589,8 @@ namespace Mall.Module.User
                     CustomModel.ButtonFilletPX,
                     CustomModel.ButtonText,
                     CustomModel.ButtonColor,
-                    CustomModel.ButtonTextColor
+                    CustomModel.ButtonTextColor,
+                    basicModel.ApplicationProtocol
                 },
                 ApplyForInfo = new
                 {
@@ -2651,6 +2657,8 @@ namespace Mall.Module.User
 
             //分销订单
             decimal OrderCommission = goods_OrderCommissionRepository.GetUserOrderCommissionStatistics(userInfo.UserId);
+            //未结算返佣
+            decimal WJSCommission = goods_OrderCommissionRepository.GetUserOrderCommissionNoSettlement(userInfo.UserId);
 
             int SuperiorId = 0;
             string SuperiorName = "";
@@ -2706,7 +2714,7 @@ namespace Mall.Module.User
                     HpReferralsGradeAudit = HpEnabled == 1 ? (basicsModel?.HpReferralsGradeAudit ?? 2) : 2,
                     CommissionWithdrawal = model.CommissionWithdrawal ?? 0,
                     TXCommission = commModel?.TXCommission ?? 0,
-                    WJSCommission = commModel?.WJSCommission ?? 0,
+                    WJSCommission,
                     model.TotalCommission,
                     OrderCommission,
                     RemitMoney = remitMoney,
@@ -3218,7 +3226,7 @@ namespace Mall.Module.User
                         if (SdisModel != null)
                         {
                             var glist = distributor_HPGradeInfoRepository.GetList(new RB_Distributor_HPGradeInfo_Extend() { TenantId = umodel.TenantId, MallBaseId = umodel.MallBaseId });
-                            int MinId = glist.Where(x => (x.IsGuest ?? 0) != 1).Min(x => x.Grade ?? 0);
+                            int MinId = glist.Where(x => (x.IsGuest ?? 0) != 1).Max(x => x.Grade ?? 0);
                             var sdisgM = glist.Where(x => x.Id == SdisModel.HPGradeId).FirstOrDefault();
                             if (MinId == (sdisgM?.Grade ?? 0)) {
                                 IsShowDistributionCenter = 2;//其上级为最后一级  和平下不能显示分销中心
@@ -4089,7 +4097,7 @@ namespace Mall.Module.User
                 string path_server = basepath + "\\upfile\\temporary\\" + pathName;
                 var Robj = HttpHelper.HttpPostForGetWXQRCodePath(GetImageUrl, JsonHelper.Serialize(postData), path_server);
                 //var Robj1 = HttpHelper.HttpPost(GetImageUrl, JsonHelper.Serialize(postData), "");
-                return Robj;
+                return "/upfile/temporary/" + pathName;
             }
             return "";
         }

Mall.Repository/Product/RB_Goods_OrderCommissionRepository.cs

@@ -91,7 +91,7 @@ namespace Mall.Repository.Product
         /// <returns></returns>
         public List<RB_Goods_OrderCommission_Extend> GetListGroupByUser_V2(int pageIndex,int pageSize,out long count,RB_Goods_OrderCommission_Extend dmodel)
         {
-            string where = $" 1=1 and o.Recycled=2";
+            string where = $" 1=1 and o.Recycled=2 and oa.ReOrderId is null";
             if (dmodel.TenantId > 0)
             {
                 where += $@" and oc.{nameof(RB_Goods_OrderCommission.TenantId)}={dmodel.TenantId}";
@@ -112,7 +112,8 @@ namespace Mall.Repository.Product
             {
                 where += $@" and oc.{nameof(RB_Goods_OrderCommission.OrderId)} in({dmodel.OrderIds})";
             }
-            if (dmodel.DistrbutionOrderSelectStatus > 0) {
+            if (dmodel.DistrbutionOrderSelectStatus > 0)
+            {
                 switch (dmodel.DistrbutionOrderSelectStatus)
                 {
                     case 1: where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)}={(int)OrderStatusEnum.NonPayment}"; break;
@@ -120,10 +121,14 @@ namespace Mall.Repository.Product
                     case 3: where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)}={(int)OrderStatusEnum.Completed}"; break;
                 }
             }
+            else {
+                where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)} in(1,2,3,4,5,6)";
+            }
 
             string sql = $@"SELECT oc.OrderId,o.OrderNo,o.UserId,oc.Grade,o.OrderStatus as DistrbutionOrderSelectStatus,SUM(oc.Commission) as Commission 
 FROM RB_Goods_OrderCommission oc
 inner join rb_goods_order o on oc.OrderId = o.OrderId
+left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5)
 where {where} group by oc.OrderId,o.OrderNo,oc.UserId,oc.Grade order by oc.OrderId desc";
             return GetPage<RB_Goods_OrderCommission_Extend>(pageIndex, pageSize, out count, sql).ToList();
         }
@@ -170,6 +175,9 @@ where {where} group by oc.OrderId,o.OrderNo,oc.UserId,oc.Grade order by oc.Order
                     case 1: where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)} in(1,2,3,4,6)"; break;
                 }
             }
+            else{
+                where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)} in(1,2,3,4,5,6)";
+            }
 
             string sql = $@"SELECT oc.OrderId,o.OrderNo,o.UserId,oc.Grade,oc.Type,oc.CommissionState,o.OrderStatus as DistrbutionOrderSelectStatus,SUM(oc.Commission) as Commission 
 FROM RB_Goods_OrderCommission oc
@@ -188,7 +196,8 @@ where {where} group by oc.OrderId,o.OrderNo,oc.UserId,oc.Grade order by oc.Order
         {
             string sql = $@"SELECT SUM(Commission) as Commission FROM rb_goods_ordercommission oc
 INNER JOIN rb_goods_order o on oc.OrderId=o.OrderId
- WHERE oc.UserId={userId} and o.OrderStatus in (1,2,3,4,5,6) and o.Recycled=2";
+left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5)
+ WHERE oc.UserId={userId} and o.OrderStatus in (1,2,3,4,5,6) and o.Recycled=2 and oa.ReOrderId is null";
 
             var obj = ExecuteScalar(sql);
             if (obj != null) {
@@ -197,6 +206,26 @@ INNER JOIN rb_goods_order o on oc.OrderId=o.OrderId
             return 0;
         }
 
+        /// <summary>
+        /// 用户未结算返佣
+        /// </summary>
+        /// <param name="userId"></param>
+        /// <returns></returns>
+        public decimal GetUserOrderCommissionNoSettlement(int userId)
+        {
+            string sql = $@"SELECT SUM(Commission) as Commission FROM rb_goods_ordercommission oc
+INNER JOIN rb_goods_order o on oc.OrderId=o.OrderId
+left join rb_goods_orderaftersale oa on oc.OrderDetailId= oa.OrderDetialId and oa.Type=1 and oa.Status=0 and oa.ReOrderStatus in (2,3,4,5)
+ WHERE oc.UserId={userId} and oc.CommissionState=1 and o.OrderStatus in (1,2,3,4,5,6) and o.Recycled=2 and oa.ReOrderId is null";
+
+            var obj = ExecuteScalar(sql);
+            if (obj != null)
+            {
+                return Convert.ToDecimal(obj);
+            }
+            return 0;
+        }
+
         /// <summary>
         /// 订单返佣
         /// </summary>

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -528,7 +528,7 @@ namespace Mall.WebApi.Controllers.MallBase
                 return ApiResult.ParamIsNull("参数有误");
             }
 
-            bool flag= orderModule.SetOrderOperation(OrderId, Type, Remark, Income, Address, req.TenantId, req.MallBaseId);
+            bool flag= orderModule.SetOrderOperation(omodel, Type, Remark, Income, Address, req.TenantId, req.MallBaseId);
             if (flag)
             {
                 return ApiResult.Success();