erp返佣查询

Mall.Module.Product/OrderModule.cs

@@ -4530,7 +4530,7 @@ namespace Mall.Module.Product
                         Config.RB_Branch_Id,
                         TemplateId = item.WorkFlowId,
                         OrderSource = 16,
-                        OtherType = 11,
+                        OtherType = 12,
                         ReFinanceId = dmodel.ReOrderId,
                         Remark = "名称:" + umodel.Name + "(" + umodel.Id + ")" + "   " + System.DateTime.Now.ToString("yyyy年MM月dd日") + "自动生成财务单据",
                         detailList

Mall.Repository/Product/RB_Goods_OrderCommissionRepository.cs

@@ -171,7 +171,7 @@ where {where} group by oc.OrderId,o.OrderNo,oc.UserId,oc.Grade order by oc.Order
                 }
             }
 
-            string sql = $@"SELECT oc.OrderId,o.OrderNo,o.UserId,oc.Grade,o.OrderStatus as DistrbutionOrderSelectStatus,SUM(oc.Commission) as Commission 
+            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
 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)

Mall.WebApi/Controllers/Finance/ERPOrderCommissionController.cs

@@ -53,8 +53,9 @@ namespace Mall.WebApi.Controllers.Finance
         public ApiResult GetDistributionCommissionPageList(object request)
         {
             var requestParm = JsonConvert.DeserializeObject<RequestParm>(request.ToString());
-            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(requestParm.msg.ToString());
-            RB_Member_User_Extend demodel = JsonConvert.DeserializeObject<RB_Member_User_Extend>(requestParm.msg.ToString());
+            string msg = EncryptionHelper.AesDecrypt(requestParm.msg.ToString(), Config.FinanceKey);
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(msg);
+            RB_Member_User_Extend demodel = JsonConvert.DeserializeObject<RB_Member_User_Extend>(msg);
 
             demodel.TenantId = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("FinanceSetting")["TenantId"]);
             demodel.MallBaseId = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("FinanceSetting")["MallBaseId"]);
@@ -72,12 +73,10 @@ namespace Mall.WebApi.Controllers.Finance
         [HttpPost]
         public ApiResult GetDistributionOrderCommissionPageList(object request)
         {
-            //处理数据
-            //byte[] data = System.Text.ASCIIEncoding.ASCII.GetBytes(request.ToString());
-            //var parms = System.Text.ASCIIEncoding.ASCII.GetString(Mall.Common.Plugin.RSAHelper.DecryptData(data));
             var requestParm = JsonConvert.DeserializeObject<RequestParm>(request.ToString());
-            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(requestParm.msg.ToString());
-            RB_Goods_OrderCommission_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_OrderCommission_Extend>(requestParm.msg.ToString());
+            string msg = EncryptionHelper.AesDecrypt(requestParm.msg.ToString(), Config.FinanceKey);
+            ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(msg);
+            RB_Goods_OrderCommission_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_OrderCommission_Extend>(msg);
             if ((demodel.UserId ?? 0) <= 0) {
                 return ApiResult.ParamIsNull("请传递用户id");
             }
@@ -126,10 +125,14 @@ namespace Mall.WebApi.Controllers.Finance
         [HttpPost]
         public ApiResult SetDistributorRemit(object request)
         {
-            var re = JsonConvert.DeserializeObject<RequestParm>(request.ToString());
-            var parms = JObject.Parse(re.msg.ToString());
+            JObject parms1 = JObject.Parse(request.ToString());
+            string msg = EncryptionHelper.AesDecrypt(parms1.GetStringValue("msg"), Config.FinanceKey);
+
+            var parms = JObject.Parse(msg.ToString());
             int RemitId = parms.GetInt("RemitId", 0);
             string Remark = parms.GetStringValue("Remark");
+            int TenantId = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("FinanceSetting")["TenantId"]);
+            int MallBaseId = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("FinanceSetting")["MallBaseId"]);
             if (RemitId <= 0)
             {
                 return ApiResult.ParamIsNull("请传递分销提现id");
@@ -139,11 +142,11 @@ namespace Mall.WebApi.Controllers.Finance
             {
                 return ApiResult.Failed("该提现不存在，请核实后再试");
             }
-            if (model.TenantId != Convert.ToInt32(re.uid))
+            if (model.TenantId != Convert.ToInt32(TenantId))
             {
                 return ApiResult.Failed("未查询到提现信息");
             }
-            if (model.MallBaseId != re.MallBaseId)
+            if (model.MallBaseId != MallBaseId)
             {
                 return ApiResult.Failed("未查询到提现信息");
             }
@@ -155,12 +158,12 @@ namespace Mall.WebApi.Controllers.Finance
             //执行发放金额
             if (model.WithdrawalWay == DistrbutorWithdrawWayEnum.ZDDK)
             {
-                var mallModel = userModule.GetMiniProgramExtend(re.MallBaseId);
+                var mallModel = userModule.GetMiniProgramExtend(MallBaseId);
                 var umodel = userModule.GetMemberUserInfo(model.UserId ?? 0);
                 var flag = App_Code.PayUtil.GetTransfersOrder(model.OrderNum, model.RemitMoney ?? 0, (model.UserId ?? 0).ToString(), umodel.OpenId, mallModel, _accessor);
                 if (flag)
                 {
-                    string msg1 = userModule.SetDistributorRemitAudit(RemitId, 2, Remark, re.uid, re.MallBaseId);
+                    string msg1 = userModule.SetDistributorRemitAudit(RemitId, 2, Remark, TenantId.ToString(), MallBaseId);
                     if (msg1 != "")
                     {
                         LogHelper.Write("提现：" + RemitId + "，失败");

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -289,7 +289,7 @@ namespace Mall.WebApi.Controllers.MallBase
         public ApiResult GetOrderStatusEnumList()
         {
             var list = EnumHelper.GetEnumList(typeof(OrderStatusEnum));
-            return ApiResult.Success("", list.Select(x => new
+            return ApiResult.Success("", list.OrderBy(x=> Convert.ToInt32(x.Value)).Select(x => new
             {
                 Name = x.Key,
                 Id = Convert.ToInt32(x.Value)