Skip to content

M
mall.oytour.com
Commit e6c049f0 authored by 吴春's avatar 吴春
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/Kui2/mall.oytour.com

parents 8a2486b1 81740e10
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 370 additions and 128 deletions
Mall.Module.Product/OrderModule.cs
View file @ e6c049f0
This diff is collapsed.
Mall.WebApi/Controllers/Finance/ERPOrderCommissionController.cs
View file @ e6c049f0
...@@ -158,23 +158,35 @@ namespace Mall.WebApi.Controllers.Finance ...@@ -158,23 +158,35 @@ namespace Mall.WebApi.Controllers.Finance
//执行发放金额 //执行发放金额
if (model.WithdrawalWay == DistrbutorWithdrawWayEnum.ZDDK) if (model.WithdrawalWay == DistrbutorWithdrawWayEnum.ZDDK)
{ {
var mallModel = userModule.GetMiniProgramExtend(MallBaseId); int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value);
var umodel = userModule.GetMemberUserInfo(model.UserId ?? 0); if (IsNormalServer == 1)
var flag = App_Code.PayUtil.GetTransfersOrder(model.OrderNum, model.RemitMoney ?? 0, (model.UserId ?? 0).ToString(), umodel.OpenId, mallModel, _accessor);
if (flag)
{ {
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); string msg1 = userModule.SetDistributorRemitAudit(RemitId, 2, Remark, TenantId.ToString(), MallBaseId);
if (msg1 != "") if (msg1 != "")
{ {
LogHelper.Write("提现：" + RemitId + "，失败"); return ApiResult.Failed("提现：" + RemitId + "，失败");
} }
return ApiResult.Success(); return ApiResult.Success();
} }
else
{
userModule.SetDistributorRemitRemark(RemitId, "ERP打款失败，请手动操作打款");
return ApiResult.Failed("支付失败");
}
} }
else else
{ {
......
Mall.WebApi/Controllers/Mall/MallController.cs
View file @ e6c049f0
...@@ -94,12 +94,6 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -94,12 +94,6 @@ namespace Mall.WebApi.Controllers.MallBase
Common.Plugin.LogHelper.Error("MallController_GetHome", ex); Common.Plugin.LogHelper.Error("MallController_GetHome", ex);
} }
//获取小程序信息
var miniProgram = new RB_MiniProgram_Extend();
if (MiniAppId != null && !string.IsNullOrEmpty(MiniAppId))
{
miniProgram = programModule.GetMiniProgramModule(new Model.Extend.User.RB_MiniProgram_Extend() { MiniAppId = MiniAppId }, isGetHomeData: true, isGetNav: 1);
}
int page_id = parms.GetInt("page_id"); int page_id = parms.GetInt("page_id");
//首页数据 //首页数据
var homePage = new object(); var homePage = new object();
...@@ -119,6 +113,20 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -119,6 +113,20 @@ namespace Mall.WebApi.Controllers.MallBase
var user_info = new object(); var user_info = new object();
//小程序 //小程序
var mall = new object(); var mall = new object();
//获取小程序信息
var miniProgram = new RB_MiniProgram_Extend();
if (MiniAppId != null && !string.IsNullOrEmpty(MiniAppId))
{
miniProgram = programModule.GetMiniProgramModule(new Model.Extend.User.RB_MiniProgram_Extend() { MiniAppId = MiniAppId }, isGetHomeData: true, isGetNav: 1);
//基础配置
setting = MallHelper.GetBasicSetting(miniProgram);
//分销基础信息
share_setting = MallHelper.GetDistributorBasicsInfo(miniProgram);
//分销商设置
share_setting_custom = MallHelper.GetDistributorCustomInfo(miniProgram);
}
if (page_id > 0) if (page_id > 0)
{ {
var targetPage = miniprogramPageTemplModule.GetMiniprogramPageTemplModule(new RB_Miniprogram_Page_Templ_Extend() var targetPage = miniprogramPageTemplModule.GetMiniprogramPageTemplModule(new RB_Miniprogram_Page_Templ_Extend()
...@@ -342,41 +350,6 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -342,41 +350,6 @@ namespace Mall.WebApi.Controllers.MallBase
}; };
} }
} }
//基础配置
setting = MallHelper.GetBasicSetting(miniProgram);
//分销基础信息
share_setting = MallHelper.GetDistributorBasicsInfo(miniProgram);
//分销商设置
share_setting_custom = MallHelper.GetDistributorCustomInfo(miniProgram);
#region 商品分类样式
var productCategoryStyle = productModule.GetProductCategoryStyleInfo(miniProgram.TenantId ?? 0, miniProgram.MallBaseId);
cat_style = new
{
cat_style = productCategoryStyle?.Type,
recommend_count = productCategoryStyle?.Style,
cat_goods_count = productCategoryStyle?.CategoryNum,
cat_goods_cols = productCategoryStyle?.RowNum
};
#endregion
mall = new
{
id = miniProgram.MallBaseId,
name = miniProgram.MallName,
user_id = 0,
created_at = miniProgram.CreateDate.HasValue ? miniProgram.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
updated_at = miniProgram.CreateDate.HasValue ? miniProgram.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
deleted_at = "0000-00-00 00:00:00",
is_delete = miniProgram.Status,
is_recycle = 0,
is_disable = miniProgram.Status,
expired_at = "0000-00-00 00:00:00",
option = new List<object>(),
setting,
};
} }
if (RequestParm.OpenId != null && !string.IsNullOrWhiteSpace(RequestParm.OpenId)) if (RequestParm.OpenId != null && !string.IsNullOrWhiteSpace(RequestParm.OpenId))
...@@ -385,6 +358,33 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -385,6 +358,33 @@ namespace Mall.WebApi.Controllers.MallBase
user_info = memberModel; user_info = memberModel;
} }
} }
#region 商品分类样式
var productCategoryStyle = productModule.GetProductCategoryStyleInfo(miniProgram.TenantId ?? 0, miniProgram.MallBaseId);
cat_style = new
{
cat_style = productCategoryStyle?.Type,
recommend_count = productCategoryStyle?.Style,
cat_goods_count = productCategoryStyle?.CategoryNum,
cat_goods_cols = productCategoryStyle?.RowNum
};
#endregion
mall = new
{
id = miniProgram.MallBaseId,
name = miniProgram.MallName,
user_id = 0,
created_at = miniProgram.CreateDate.HasValue ? miniProgram.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
updated_at = miniProgram.CreateDate.HasValue ? miniProgram.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
deleted_at = "0000-00-00 00:00:00",
is_delete = miniProgram.Status,
is_recycle = 0,
is_disable = miniProgram.Status,
expired_at = "0000-00-00 00:00:00",
option = new List<object>(),
setting,
};
var miniPageList = programPageModule.GetMiniprogram_Page_ListExtModule(new RB_MiniProgram_Page_Extend() { MallBaseId = RequestParm.MallBaseId }); var miniPageList = programPageModule.GetMiniprogram_Page_ListExtModule(new RB_MiniProgram_Page_Extend() { MallBaseId = RequestParm.MallBaseId });
var objResult = new var objResult = new
......
Mall.WebApi/Controllers/Mall/MallHelper.cs
View file @ e6c049f0
...@@ -1594,49 +1594,47 @@ namespace Mall.WebApi.Controllers ...@@ -1594,49 +1594,47 @@ namespace Mall.WebApi.Controllers
} }
//商城风格 //商城风格
var mallStyle = new object(); var mallStyle = new object();
if (miniProgram?.MallShopStyle > 0)
ResultMallShopStyle resultMallShopStyle = new ResultMallShopStyle();
switch (miniProgram.MallShopStyle)
{ {
ResultMallShopStyle resultMallShopStyle = new ResultMallShopStyle(); case MallShopStyleEnum.Default:
switch (miniProgram.MallShopStyle) resultMallShopStyle = new ResultMallShopStyle() { main = "#ff4544", secondary = "#f39800" };
{ break;
case MallShopStyleEnum.Default: case MallShopStyleEnum.VibrantYellow:
resultMallShopStyle = new ResultMallShopStyle() { main = "#ff4544", secondary = "#f39800" }; resultMallShopStyle = new ResultMallShopStyle() { main = "#ff4544", secondary = "#f39800" };
break; break;
case MallShopStyleEnum.VibrantYellow: case MallShopStyleEnum.RomanticPowder:
resultMallShopStyle = new ResultMallShopStyle() { main = "#ff4544", secondary = "#f39800" }; resultMallShopStyle = new ResultMallShopStyle() { main = "#ff547b", secondary = "#ffe6e8" };
break; break;
case MallShopStyleEnum.RomanticPowder: case MallShopStyleEnum.StreamerGold:
resultMallShopStyle = new ResultMallShopStyle() { main = "#ff547b", secondary = "#ffe6e8" }; resultMallShopStyle = new ResultMallShopStyle() { main = "#ddb766", secondary = "#f0ebd8" };
break; break;
case MallShopStyleEnum.StreamerGold: case MallShopStyleEnum.ElegantPurple:
resultMallShopStyle = new ResultMallShopStyle() { main = "#ddb766", secondary = "#f0ebd8" }; resultMallShopStyle = new ResultMallShopStyle() { main = "#7783ea", secondary = "#e9ebff" };
break; break;
case MallShopStyleEnum.ElegantPurple: case MallShopStyleEnum.TasteRed:
resultMallShopStyle = new ResultMallShopStyle() { main = "#7783ea", secondary = "#e9ebff" }; resultMallShopStyle = new ResultMallShopStyle() { main = "#ff4544", secondary = "#555555" };
break; break;
case MallShopStyleEnum.TasteRed: case MallShopStyleEnum.FreshGreen:
resultMallShopStyle = new ResultMallShopStyle() { main = "#ff4544", secondary = "#555555" }; resultMallShopStyle = new ResultMallShopStyle() { main = "#63be72", secondary = "#e1f4e3" };
break; break;
case MallShopStyleEnum.FreshGreen: case MallShopStyleEnum.BusinessBlue:
resultMallShopStyle = new ResultMallShopStyle() { main = "#63be72", secondary = "#e1f4e3" }; resultMallShopStyle = new ResultMallShopStyle() { main = "#4a90e2", secondary = "#dbe9f9" };
break; break;
case MallShopStyleEnum.BusinessBlue: case MallShopStyleEnum.PureBlack:
resultMallShopStyle = new ResultMallShopStyle() { main = "#4a90e2", secondary = "#dbe9f9" }; resultMallShopStyle = new ResultMallShopStyle() { main = "#333333", secondary = "#dedede" };
break; break;
case MallShopStyleEnum.PureBlack: case MallShopStyleEnum.PassionateRed:
resultMallShopStyle = new ResultMallShopStyle() { main = "#333333", secondary = "#dedede" }; resultMallShopStyle = new ResultMallShopStyle() { main = "#ff4544", secondary = "#ffdada" };
break; break;
case MallShopStyleEnum.PassionateRed:
resultMallShopStyle = new ResultMallShopStyle() { main = "#ff4544", secondary = "#ffdada" };
break;
}
mallStyle = new
{
resultMallShopStyle?.main,
resultMallShopStyle?.secondary,
};
} }
mallStyle = new
{
resultMallShopStyle?.main,
resultMallShopStyle?.secondary,
};
var setting = new var setting = new
{ {
mallStyle, mallStyle,
......
Mall.WebApi/Controllers/Product/OrderController.cs
View file @ e6c049f0
...@@ -17,6 +17,8 @@ using Mall.Common; ...@@ -17,6 +17,8 @@ using Mall.Common;
using Mall.Module.Product; using Mall.Module.Product;
using Mall.Common.Enum.Goods; using Mall.Common.Enum.Goods;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration.Json;
namespace Mall.WebApi.Controllers.MallBase namespace Mall.WebApi.Controllers.MallBase
{ {
...@@ -665,14 +667,48 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -665,14 +667,48 @@ namespace Mall.WebApi.Controllers.MallBase
if (omodel.IsApplyForCancel != 1) { if (omodel.IsApplyForCancel != 1) {
return ApiResult.Failed("该订单未申请取消该订单"); return ApiResult.Failed("该订单未申请取消该订单");
} }
int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value);
bool flag = orderModule.SetOrderApplyForCancelAudit(omodel, Type, Remark, req.TenantId, req.MallBaseId); if (Type == 1 && IsNormalServer == 1)
if (flag)
{ {
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 { else
return ApiResult.Failed(); {
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 ...@@ -1418,27 +1454,43 @@ namespace Mall.WebApi.Controllers.MallBase
if (orderModel == null) { if (orderModel == null) {
return ApiResult.Failed("未查询到订单信息"); return ApiResult.Failed("未查询到订单信息");
} }
//获取小程序信息 int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value);
var mallModel = orderModule.GetMiniProgramExtend(req.MallBaseId); if (IsNormalServer == 1)
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, var mallModel = orderModule.GetMiniProgramExtend(req.MallBaseId);
OrderNumber = orderModel.MerchantsNo, int RefundNum = orderModule.GetOrderRefundOnlineTradeNum(ReModel.OrderId ?? 0, req.TenantId, req.MallBaseId);
RefundNumber = RefundOrderNo string RefundOrderNo = orderModel.OrderNo + (RefundNum + 1);
}; var pram = new Common.Pay.WeChatPat.PayParam()
var Robj = new App_Code.PayUtil().Refund(pram, mallModel, _accessor); {
if (Robj.IsSuccess) { 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); bool flag = orderModule.SetOrderAfterSaleForRefunds(ReOrderId, Refund, req.TenantId, req.MallBaseId);
if (flag == false) { if (flag)
//日志记录 {
LogHelper.Write("售后订单：" + ReOrderId + ",金额：" + Refund + " 退款记录失败"); return ApiResult.Success("");
}
else {
return ApiResult.Failed();
} }
return ApiResult.Success("");
} }
return ApiResult.Failed();
} }
......
Mall.WebApi/Controllers/User/UserController.cs
View file @ e6c049f0
...@@ -16,6 +16,8 @@ using Newtonsoft.Json.Linq; ...@@ -16,6 +16,8 @@ using Newtonsoft.Json.Linq;
using Mall.Common; using Mall.Common;
using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration.Json;
namespace Mall.WebApi.Controllers.User namespace Mall.WebApi.Controllers.User
{ {
...@@ -1813,21 +1815,34 @@ namespace Mall.WebApi.Controllers.User ...@@ -1813,21 +1815,34 @@ namespace Mall.WebApi.Controllers.User
//执行发放金额 //执行发放金额
if (model.WithdrawalWay == DistrbutorWithdrawWayEnum.ZDDK) if (model.WithdrawalWay == DistrbutorWithdrawWayEnum.ZDDK)
{ {
var mallModel = userModule.GetMiniProgramExtend(re.MallBaseId); int IsNormalServer = Convert.ToInt32(new ConfigurationBuilder().Add(new JsonConfigurationSource { Path = "appsettings.json" }).Build().GetSection("IsNormalServer").Value);
var umodel = userModule.GetMemberUserInfo(model.UserId ?? 0); if (IsNormalServer == 1)
var flag = App_Code.PayUtil.GetTransfersOrder(model.OrderNum, model.RemitMoney ?? 0, (model.UserId ?? 0).ToString(), umodel.OpenId, mallModel, _accessor);
if (flag)
{ {
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); string msg1 = userModule.SetDistributorRemitAudit(RemitId, Type, Remark, re.uid, re.MallBaseId);
if (msg1 != "") if (msg1 != "")
{ {
LogHelper.Write("提现：" + RemitId + "，失败"); return ApiResult.Failed("提现：" + RemitId + "，失败");
} }
return ApiResult.Success(); return ApiResult.Success();
} }
else {
return ApiResult.Failed("支付失败");
}
} }
else else
{ {
......
Mall.WebApi/appsettings.json
View file @ e6c049f0
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
}, },
"VirtualDirectory": "WebFile", "VirtualDirectory": "WebFile",
"FileService": "2", "FileService": "2",
"IsNormalServer": 2,
"FinanceSetting": { "FinanceSetting": {
"TenantId": 1, "TenantId": 1,
"MallBaseId": 1, "MallBaseId": 1,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment