1

Mall.Common/Plugin/RSAHelper.cs

@@ -20,6 +20,11 @@ namespace Mall.Common.Plugin
         static string PrivateKey = @"<RSAKeyValue><Modulus>4W8WliHbSkVE20kIze0KvCIOJgwG4PSRHHb6LNjc3smttrU952pGFi7g7dly1tj+oNUpCB5Ba5a1EUQI9vlfCXUYRICdiNneW6T78BFED5x8HZp8JUCMeatD8wFrKPVV4twaj2QtqGsTw60ZVmVFzHi/eNLVBYvfnzKCGCp0dG8=</Modulus><Exponent>AQAB</Exponent><P>97qvHs/ptDJiw+FGvqvNLOJX1TJPbed9sfNNEhAZe+x/XPQfnzu0IxEkIxH/BL29gVryWExH8b/ZcgQuXCpUsw==</P><Q>6PXZPVntcKdo4ZlbQAU/+VI47rAZGkNtW/w25UVGrVC31Zc3GSqCVlKZgccRe6/PLrjOUBKDRYiYd3Yj+azXVQ==</Q><DP>ciyzW3Md1jRGutrQHT7XUHF9Y8BNRW0kzGhDRCjxZeEpDjFhhaUhr+vNiPBZZdkBR2YgPbviiLQQRvFQYKAN6w==</DP><DQ>AgBSrG9AVe5qPT3nBcbFxOuK56oFnS8lGlwxUIjm0YhW+/O/mmy+D+XHwdCm+swI2Jrn0tJF5GwG+0e9iWCNvQ==</DQ><InverseQ>WsKgSM0RiMFpXGoyL8bqZi2q1MAB+iz4WXPcL/OmHKluo8wuK/Pk+zOKkyjMO91tKXhjLOd7xpVb1AIsk/fAeQ==</InverseQ><D>daiCNFd1WZ0vo/fJZZkLWke39LmgOXbL6fxa9F83X/wI82xC4+4+qENNWDZ+zo2w0AaRBNCtulaNKHbG6wgaRh15yuOHkr90oydquHHPUqCjFWnIEYx2NnX85HtyBTwowCeePajCTsEi6vMRgKlBCIFWxqc6z5To1lTgfqtKb8k=</D></RSAKeyValue>";
         static RSACryptoServiceProvider rsaProvider = new RSACryptoServiceProvider(1024);
 
+        /// <summary>
+        /// 加密
+        /// </summary>
+        /// <param name="data"></param>
+        /// <returns></returns>
         public static byte[] EncryptData(byte[] data)
         {
 
@@ -34,6 +39,11 @@ namespace Mall.Common.Plugin
             return buffer;
         }
 
+        /// <summary>
+        /// 解密
+        /// </summary>
+        /// <param name="data"></param>
+        /// <returns></returns>
         public static byte[] DecryptData(byte[] data)
         {
 

Mall.Module.User/UserModule.cs

@@ -3291,7 +3291,7 @@ namespace Mall.Module.User
                 }
             };
             return distributor_HPCommissionRepository.Exists(wheres) ? 1 : 2;
-        }
+        }        
 
         /// <summary>
         /// 删除分销
@@ -3446,6 +3446,88 @@ namespace Mall.Module.User
             };
         }
 
+        /// <summary>
+        /// 获取和平分销在商品中使用
+        /// </summary>
+        /// <param name="categoryIds"></param>
+        /// <param name="costPrice"></param>
+        /// <param name="tenantId"></param>
+        /// <param name="mallBaseId"></param>
+        /// <returns></returns>
+        public object GetHpDistributorGoodsInfo(string categoryIds, decimal costPrice, int tenantId, int mallBaseId)
+        {
+            //判断是否开启和平返佣
+            List<WhereHelper> wheres = new List<WhereHelper>() {
+                new WhereHelper(){
+                        FiledName=nameof(RB_Distributor_HPCommission_Extend.Status),
+                        FiledValue=0,
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_Distributor_HPCommission_Extend.Enabled),
+                        FiledValue=1,
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_Distributor_HPCommission_Extend.TenantId),
+                        FiledValue=tenantId,
+                        OperatorEnum=OperatorEnum.Equal
+                },
+                new WhereHelper(){
+                        FiledName=nameof(RB_Distributor_HPCommission_Extend.MallBaseId),
+                        FiledValue=mallBaseId,
+                        OperatorEnum=OperatorEnum.Equal
+                }
+            };
+            if (!distributor_HPCommissionRepository.Exists(wheres))
+            {
+                return new
+                {
+                    Status = 2,
+                    RatioList = new { },
+                    Msg = "未配置和平返佣"
+                };
+            }
+            List<RB_Distributor_HPCommission_Extend> hpcList = new List<RB_Distributor_HPCommission_Extend>();
+            if (string.IsNullOrEmpty(categoryIds))
+            {
+                hpcList = distributor_HPCommissionRepository.GetList(new RB_Distributor_HPCommission_Extend() { IsCommon = 1, TenantId = tenantId, MallBaseId = mallBaseId });
+            }
+            else
+            {
+                hpcList = distributor_HPCommissionRepository.GetList(new RB_Distributor_HPCommission_Extend() { CategoryIds = categoryIds, TenantId = tenantId, MallBaseId = mallBaseId });
+                if (!hpcList.Any())
+                {
+                    hpcList = distributor_HPCommissionRepository.GetList(new RB_Distributor_HPCommission_Extend() { IsCommon = 1, TenantId = tenantId, MallBaseId = mallBaseId });
+                }
+            }
+            if (hpcList.Any())
+            {
+                var hpcModel = hpcList.FirstOrDefault();
+                //查询直客毛利率
+                var gList = distributor_HPGradeRatioRepository.GetList(new RB_Distributor_HPGradeRatio_Extend() { CommissionId = hpcModel.Id, TenantId = tenantId, MallBaseId = mallBaseId });
+                return new
+                {
+                    Status = 1,
+                    RatioList = gList.OrderBy(x => x.Grade).Select(x => new
+                    {
+                        x.Id,
+                        x.Grade,
+                        x.GradeName,
+                        x.CommissionRatio
+                    }),
+                    Msg = ""
+                };
+                
+            }
+            return new
+            {
+                Status = 3,
+                RatioList = new { },
+                Msg = "未匹配到适用的返佣"
+            };
+        }
+
         #endregion
     }
 }

Mall.WebApi/Controllers/User/UserController.cs

@@ -2506,6 +2506,26 @@ namespace Mall.WebApi.Controllers.User
             return ApiResult.Success("", obj);
         }
 
+        /// <summary>
+        /// 获取和平分销在商品中使用详情
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetHpDistributorGoodsInfo()
+        {
+            var req = RequestParm;
+            JObject parms = JObject.Parse(req.msg.ToString());
+            string CategoryIds = parms.GetStringValue("CategoryIds");
+            decimal CostPrice = parms.GetDecimal("CostPrice");
+            if (CostPrice <= 0)
+            {
+                return ApiResult.ParamIsNull("请传递成本价格");
+            }
+
+            var obj = userModule.GetHpDistributorGoodsInfo(CategoryIds, CostPrice, req.TenantId, req.MallBaseId);
+            return ApiResult.Success("", obj);
+        }
+
         #endregion
     }
 }
\ No newline at end of file