增加正式服务掉退款接口控制

Mall.WebApi/Controllers/Finance/ERPOrderCommissionController.cs

@@ -158,23 +158,35 @@ namespace Mall.WebApi.Controllers.Finance
             //执行发放金额
             if (model.WithdrawalWay == DistrbutorWithdrawWayEnum.ZDDK)
             {
-                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)
+                int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value);
+                if (IsNormalServer == 1)
                 {
+                    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, TenantId.ToString(), MallBaseId);
+                        if (msg1 != "")
+                        {
+                            LogHelper.Write("提现：" + RemitId + "，失败");
+                        }
+                        return ApiResult.Success();
+                    }
+                    else
+                    {
+                        userModule.SetDistributorRemitRemark(RemitId, "ERP打款失败，请手动操作打款");
+                        return ApiResult.Failed("支付失败");
+                    }
+                }
+                else {
                     string msg1 = userModule.SetDistributorRemitAudit(RemitId, 2, Remark, TenantId.ToString(), MallBaseId);
                     if (msg1 != "")
                     {
-                        LogHelper.Write("提现：" + RemitId + "，失败");
+                        return ApiResult.Failed("提现：" + RemitId + "，失败");
                     }
                     return ApiResult.Success();
                 }
-                else
-                {
-                    userModule.SetDistributorRemitRemark(RemitId, "ERP打款失败，请手动操作打款");
-                    return ApiResult.Failed("支付失败");
-                }
             }
             else
             {

Mall.WebApi/Controllers/Product/OrderController.cs

@@ -17,6 +17,8 @@ using Mall.Common;
 using Mall.Module.Product;
 using Mall.Common.Enum.Goods;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration.Json;
 
 namespace Mall.WebApi.Controllers.MallBase
 {
@@ -665,14 +667,48 @@ namespace Mall.WebApi.Controllers.MallBase
             if (omodel.IsApplyForCancel != 1) {
                 return ApiResult.Failed("该订单未申请取消该订单");
             }
-
-            bool flag = orderModule.SetOrderApplyForCancelAudit(omodel, Type, Remark, req.TenantId, req.MallBaseId);
-            if (flag)
+            int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value);
+            if (Type == 1 && IsNormalServer == 1)
             {
-                return ApiResult.Success();
+                //获取小程序信息
+                var mallModel = orderModule.GetMiniProgramExtend(req.MallBaseId);
+                int RefundNum = orderModule.GetOrderRefundOnlineTradeNum(OrderId, req.TenantId, req.MallBaseId);
+                string RefundOrderNo = omodel.OrderNo + (RefundNum + 1);
+                var pram = new Common.Pay.WeChatPat.PayParam()
+                {
+                    TotalFee = Convert.ToInt32((omodel.Income ?? 0) * 100),
+                    RefundFee = (omodel.Income ?? 0),
+                    OrderNumber = omodel.MerchantsNo,
+                    RefundNumber = RefundOrderNo
+                };
+                var Robj = new App_Code.PayUtil().Refund(pram, mallModel, _accessor);
+                if (Robj.IsSuccess)
+                {
+                    bool flag = orderModule.SetOrderApplyForCancelAudit(omodel, Type, Remark, req.TenantId, req.MallBaseId);
+                    if (flag)
+                    {
+                        return ApiResult.Success();
+                    }
+                    else
+                    {
+                        return ApiResult.Failed();
+                    }
+                }
+                else {
+                    return ApiResult.Failed();
+                }
             }
-            else {
-                return ApiResult.Failed();
+            else
+            {
+                bool flag = orderModule.SetOrderApplyForCancelAudit(omodel, Type, Remark, req.TenantId, req.MallBaseId);
+                if (flag)
+                {
+                    return ApiResult.Success();
+                }
+                else
+                {
+                    return ApiResult.Failed();
+                }
             }
         }
 
@@ -1418,27 +1454,43 @@ namespace Mall.WebApi.Controllers.MallBase
             if (orderModel == null) {
                 return ApiResult.Failed("未查询到订单信息");
             }
-            //获取小程序信息
-            var mallModel = orderModule.GetMiniProgramExtend(req.MallBaseId);
-            int RefundNum = orderModule.GetOrderRefundOnlineTradeNum(ReModel.OrderId ?? 0, req.TenantId, req.MallBaseId);
-            string RefundOrderNo = orderModel.OrderNo + (RefundNum + 1);
-            var pram = new Common.Pay.WeChatPat.PayParam()
+            int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value);
+            if (IsNormalServer == 1)
             {
-                TotalFee = Convert.ToInt32(Refund * 100),
-                RefundFee = Refund,
-                OrderNumber = orderModel.MerchantsNo,
-                RefundNumber = RefundOrderNo
-            };
-            var Robj = new App_Code.PayUtil().Refund(pram, mallModel, _accessor);
-            if (Robj.IsSuccess) {
+                //获取小程序信息
+                var mallModel = orderModule.GetMiniProgramExtend(req.MallBaseId);
+                int RefundNum = orderModule.GetOrderRefundOnlineTradeNum(ReModel.OrderId ?? 0, req.TenantId, req.MallBaseId);
+                string RefundOrderNo = orderModel.OrderNo + (RefundNum + 1);
+                var pram = new Common.Pay.WeChatPat.PayParam()
+                {
+                    TotalFee = Convert.ToInt32(Refund * 100),
+                    RefundFee = Refund,
+                    OrderNumber = orderModel.MerchantsNo,
+                    RefundNumber = RefundOrderNo
+                };
+                var Robj = new App_Code.PayUtil().Refund(pram, mallModel, _accessor);
+                if (Robj.IsSuccess)
+                {
+                    bool flag = orderModule.SetOrderAfterSaleForRefunds(ReOrderId, Refund, req.TenantId, req.MallBaseId);
+                    if (flag == false)
+                    {
+                        //日志记录
+                        LogHelper.Write("售后订单：" + ReOrderId + ",金额：" + Refund + " 退款记录失败");
+                    }
+                    return ApiResult.Success("");
+                }
+                return ApiResult.Failed();
+            }
+            else {
                 bool flag = orderModule.SetOrderAfterSaleForRefunds(ReOrderId, Refund, req.TenantId, req.MallBaseId);
-                if (flag == false) {
-                    //日志记录
-                    LogHelper.Write("售后订单：" + ReOrderId + ",金额：" + Refund + " 退款记录失败");
+                if (flag)
+                {
+                    return ApiResult.Success("");
+                }
+                else {
+                    return ApiResult.Failed();
                 }
-                return ApiResult.Success("");
             }
-            return ApiResult.Failed();
         }
 
 

Mall.WebApi/Controllers/User/UserController.cs

@@ -16,6 +16,8 @@ using Newtonsoft.Json.Linq;
 using Mall.Common;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration.Json;
 
 namespace Mall.WebApi.Controllers.User
 {
@@ -1813,21 +1815,34 @@ namespace Mall.WebApi.Controllers.User
                 //执行发放金额
                 if (model.WithdrawalWay == DistrbutorWithdrawWayEnum.ZDDK)
                 {
-                    var mallModel = userModule.GetMiniProgramExtend(re.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)
+                    int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value);
+                    if (IsNormalServer == 1)
                     {
+                        var mallModel = userModule.GetMiniProgramExtend(re.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, Type, Remark, re.uid, re.MallBaseId);
+                            if (msg1 != "")
+                            {
+                                LogHelper.Write("提现：" + RemitId + "，失败");
+                            }
+                            return ApiResult.Success();
+                        }
+                        else
+                        {
+                            return ApiResult.Failed("支付失败");
+                        }
+                    }
+                    else {
                         string msg1 = userModule.SetDistributorRemitAudit(RemitId, Type, Remark, re.uid, re.MallBaseId);
                         if (msg1 != "")
                         {
-                            LogHelper.Write("提现：" + RemitId + "，失败");
+                            return ApiResult.Failed("提现：" + RemitId + "，失败");
                         }
                         return ApiResult.Success();
                     }
-                    else {
-                        return ApiResult.Failed("支付失败");
-                    }
                 }
                 else
                 {

Mall.WebApi/appsettings.json

@@ -41,6 +41,7 @@
   },
   "VirtualDirectory": "WebFile",
   "FileService": "2",
+  "IsNormalServer": 2,
   "FinanceSetting": {
     "TenantId": 1,
     "MallBaseId": 1,