Skip to content

M
mall.oytour.com
Commit 69d1c69b authored by 黄奎's avatar 黄奎
Browse files
Options

代码优化

parent 15c748cb
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 42 deletions
Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs
View file @ 69d1c69b
......@@ -565,6 +565,7 @@ namespace Mall.Module.MarketingCenter
}
catch(Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "AnalyzePlusModule_educationteacher");
}
item.data = educationTeacherModel;
break;
......
Mall.Module.Product/OrderModule.cs
View file @ 69d1c69b
......@@ -222,7 +222,7 @@ namespace Mall.Module.Product
/// <summary>
/// 财务单据规则
/// </summary>
private static RB_Finance_ConfigurineRepository financeConfigurineRepository = new RB_Finance_ConfigurineRepository();
private readonly RB_Finance_ConfigurineRepository financeConfigurineRepository = new RB_Finance_ConfigurineRepository();
/// <summary>
/// 粉象返佣
/// </summary>
......@@ -312,29 +312,29 @@ namespace Mall.Module.Product
/// <summary>
/// 司导站点
/// </summary>
private RB_GuideCar_SiteRepository guideCar_SiteRepository = new RB_GuideCar_SiteRepository();
private readonly RB_GuideCar_SiteRepository guideCar_SiteRepository = new RB_GuideCar_SiteRepository();
/// <summary>
/// 车辆颜色
/// </summary>
private RB_GuideCar_CarColorRepository guideCar_CarColorRepository = new RB_GuideCar_CarColorRepository();
private readonly RB_GuideCar_CarColorRepository guideCar_CarColorRepository = new RB_GuideCar_CarColorRepository();
/// <summary>
/// 快递配置
/// </summary>
private RB_Express_ConfigRepository express_ConfigRepository = new RB_Express_ConfigRepository();
private readonly RB_Express_ConfigRepository express_ConfigRepository = new RB_Express_ConfigRepository();
/// <summary>
/// 教育订单对应的老师
/// </summary>
private RB_Goods_WK_TeacherRepository goodsWKTeacherRepository = new RB_Goods_WK_TeacherRepository();
private readonly RB_Goods_WK_TeacherRepository goodsWKTeacherRepository = new RB_Goods_WK_TeacherRepository();
/// <summary>
/// 教育对应的订单课程卡
/// </summary>
private Mall.Repository.Education.RB_Education_MemberCouponRepository educationMemberCouponRepository = new Mall.Repository.Education.RB_Education_MemberCouponRepository();
private readonly Repository.Education.RB_Education_MemberCouponRepository educationMemberCouponRepository = new Repository.Education.RB_Education_MemberCouponRepository();
/// <summary>
/// 套餐卡仓储层对象
/// </summary>
private RB_Reserve_MemberCouponRepository reserveMemberCouponRepository = new RB_Reserve_MemberCouponRepository();
private readonly RB_Reserve_MemberCouponRepository reserveMemberCouponRepository = new RB_Reserve_MemberCouponRepository();
/// <summary>
/// 服务人员仓储层对象
......@@ -627,7 +627,7 @@ namespace Mall.Module.Product
/// <returns></returns>
public ApiResult SetGoodsShoppingCartGetInfo(RB_Goods_ShoppingCart_Extend demodel)
{
bool flag = false;
bool flag;
var gmodel = goodsRepository.GetEntity(demodel.GoodsId);
if (gmodel.IsCustomSpecification == 1)
{
......@@ -4228,7 +4228,7 @@ namespace Mall.Module.Product
/// <returns></returns>
public bool UpdateERPGoodsOrderInfoModule(RB_Goods_Order_Extend extModel, RB_Goods_Online_Trade_Extend tradeModel, int FinanceId = 0)
{
bool flag = false;
bool flag;
Dictionary<string, object> fileds = new Dictionary<string, object>()
{
{nameof(RB_Goods_Order_Extend.MerchantsNo),extModel.MerchantsNo },
......@@ -7925,7 +7925,7 @@ namespace Mall.Module.Product
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "CancelAppletGoodsOrderInfo");
}
}
......
Mall.Module.Reserve/ReserveModule.cs
View file @ 69d1c69b
......@@ -490,6 +490,7 @@ namespace Mall.Module.Reserve
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "AddOrUpdateServiceTargetDate");
return false;
}
}
......
Mall.Module.User/MiniProgramMsgModule.cs
View file @ 69d1c69b
......@@ -885,6 +885,7 @@ namespace Mall.Module.User
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "SendEducationDynamicMsg");
LogHelper.Write(string.Format("SendEducationDynamicMsg:wenXinResult:{0}", wenXinResult));
}
if (successCount == OpenIds.Count())
......@@ -979,6 +980,7 @@ namespace Mall.Module.User
}
catch (Exception ex)
{
LogHelper.Write(ex, "SendCourseOrderTplMsg");
LogHelper.Write(string.Format("SendCourseOrderTplMsg:wenXinResult:{0}", wenXinResult));
}
if (successCount == OpenIds.Count())
......
Mall.Module.User/RB_WeChatPublicAccountModule.cs
View file @ 69d1c69b
......@@ -48,13 +48,14 @@ namespace Mall.Module.User
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "SendOrderSucceedMsg_1");
try
{
access_token = AccessTokenContainer.GetAccessTokenResult(appletWeChatModel.AppId).access_token;
}
catch (Exception exs)
{
Common.Plugin.LogHelper.Write(exs, "SendOrderSucceedMsg_2");
}
}
if (string.IsNullOrWhiteSpace(access_token))
......@@ -107,6 +108,7 @@ namespace Mall.Module.User
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "SendOrderSucceedMsg_1");
}
}
}
......@@ -114,6 +116,7 @@ namespace Mall.Module.User
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "SendOrderSucceedMsg_2");
return false;
}
}
......@@ -149,13 +152,14 @@ namespace Mall.Module.User
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "SendOrderCancelMsg_1");
try
{
access_token = AccessTokenContainer.GetAccessTokenResult(appletWeChatModel.AppId).access_token;
}
catch (Exception exs)
{
Common.Plugin.LogHelper.Write(exs, "SendOrderCancelMsg_2");
}
}
......@@ -201,6 +205,7 @@ namespace Mall.Module.User
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "SendOrderCancelMsg_3");
}
}
}
......@@ -208,6 +213,7 @@ namespace Mall.Module.User
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "SendOrderCancelMsg_4");
return false;
}
}
......
Mall.Module.User/UserCommonModule.cs
View file @ 69d1c69b
......@@ -610,7 +610,7 @@ namespace Mall.Module.User
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "InsertOrderPayInfo");
}
appletWeChatModule.SendOrderSucceedMsg(oldOrder.TenantId, oldOrder.MallBaseId, umodel.OpenId, oldOrder.OrderNo, oldOrder.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss"), (oldOrder.Income ?? 0).ToString(), goodsName);
......
Mall.WebApi/Controllers/Education/AppletEducationController.cs
View file @ 69d1c69b
......@@ -34,9 +34,9 @@ namespace Mall.WebApi.Controllers.Education
{
private readonly EducationModule educationModule = new EducationModule();
private readonly DynamicModule dynamicModule = new DynamicModule();
private Module.User.UserModule UserModule = new Module.User.UserModule();
private Module.Product.ProductModule productModule = new Module.Product.ProductModule();
private readonly Module.User.MiniProgramModule programModule = new Module.User.MiniProgramModule();
private readonly UserModule UserModule = new UserModule();
private readonly Module.Product.ProductModule productModule = new Module.Product.ProductModule();
private readonly MiniProgramModule programModule = new MiniProgramModule();
private readonly Module.MarketingCenter.SurveyModule surveyModule = new Module.MarketingCenter.SurveyModule();
#region 课程卡
......@@ -87,7 +87,6 @@ namespace Mall.WebApi.Controllers.Education
[HttpPost]
public ApiResult GrantCoupon()
{
var parms = RequestParm;
var userInfo = AppletUserInfo;
var query = JsonConvert.DeserializeObject<RB_Education_MemberCoupon_Extend>(RequestParm.msg.ToString());
query.TenantId = userInfo.TenantId;
......@@ -149,20 +148,22 @@ namespace Mall.WebApi.Controllers.Education
}
RB_Education_MemberCoupon_Extend memberCoupon = new RB_Education_MemberCoupon_Extend();
memberCoupon.Id = 0;
memberCoupon.UserId = userInfo.UserId;
memberCoupon.Description = oldLogisticsModel.Describe;
memberCoupon.CreateDate = System.DateTime.Now;
memberCoupon.TenantId = userInfo.TenantId;
memberCoupon.MallBaseId = userInfo.MallBaseId;
memberCoupon.Remarks = "";
memberCoupon.CouponId = oldLogisticsModel.ID;
memberCoupon.Name = oldLogisticsModel.Name;
memberCoupon.HeXiao = oldLogisticsModel.HeXiao;
memberCoupon.UseHeXiao = 0;
memberCoupon.UseType = oldLogisticsModel.UseType;
if (oldLogisticsModel.IndateType == Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon)
RB_Education_MemberCoupon_Extend memberCoupon = new RB_Education_MemberCoupon_Extend
{
Id = 0,
UserId = userInfo.UserId,
Description = oldLogisticsModel.Describe,
CreateDate = System.DateTime.Now,
TenantId = userInfo.TenantId,
MallBaseId = userInfo.MallBaseId,
Remarks = "",
CouponId = oldLogisticsModel.ID,
Name = oldLogisticsModel.Name,
HeXiao = oldLogisticsModel.HeXiao,
UseHeXiao = 0,
UseType = oldLogisticsModel.UseType
};
if (oldLogisticsModel.IndateType == IndateTypeEnum.DayHorizon)
{
memberCoupon.StartDate = System.DateTime.Now;
LogHelper.WriteInfo(userInfo.Name + "课程卡领取时间:" + memberCoupon.StartDate);
......@@ -173,8 +174,10 @@ namespace Mall.WebApi.Controllers.Education
memberCoupon.StartDate = oldLogisticsModel.StartDate;
memberCoupon.EndDate = oldLogisticsModel.EndDate;
}
var memberList = new List<RB_Education_MemberCoupon_Extend>();
memberList.Add(memberCoupon);
var memberList = new List<RB_Education_MemberCoupon_Extend>
{
memberCoupon
};
bool result = educationModule.GrantCoupon(memberList, oldLogisticsModel);
if (result)
{
......@@ -230,7 +233,6 @@ namespace Mall.WebApi.Controllers.Education
[HttpPost]
public ApiResult ShareEducationCoupon()
{
var parms = RequestParm;
var userInfo = AppletUserInfo;
var query = JsonConvert.DeserializeObject<RB_Education_Coupon_Extend>(RequestParm.msg.ToString());
query.TenantId = userInfo.TenantId;
......@@ -239,7 +241,6 @@ namespace Mall.WebApi.Controllers.Education
RB_Education_Coupon_Extend resultModel = new RB_Education_Coupon_Extend();
if (query.TriggerType == 2)
{
query.TriggerType = 4;
resultModel = educationModule.AutoEducationCoupon(query);
if (resultModel == null || resultModel.ID == 0)
......@@ -450,7 +451,6 @@ namespace Mall.WebApi.Controllers.Education
JObject parms = JObject.Parse(req.msg.ToString());
int GoodsId = parms.GetInt("GoodsId", 0);
int Time = parms.GetInt("Time", 10);//秒
int CourseId = parms.GetInt("CourseId", 0);//课程id
if (GoodsId <= 0)
{
return ApiResult.ParamIsNull("请传递课程id");
......@@ -792,7 +792,7 @@ namespace Mall.WebApi.Controllers.Education
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "InsertOrderPayInfo");
return ApiResult.Failed("评论内容检测失败，请稍后再试");
}
#endregion
......@@ -1621,7 +1621,7 @@ namespace Mall.WebApi.Controllers.Education
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "GetDynamicComment");
return ApiResult.Failed("评论内容检测失败，请稍后再试");
}
#endregion
......
Mall.WebApi/Controllers/Education/AppletSchoolController.cs
View file @ 69d1c69b
......@@ -26,7 +26,6 @@ namespace Mall.WebApi.Controllers.Education
{
private readonly EducationModule educationModule = new EducationModule();
private readonly ProductModule productModule = new ProductModule();
private Module.User.UserModule UserModule = new Module.User.UserModule();
private readonly DynamicModule dynamicModule = new DynamicModule();
#region 课程
......@@ -342,8 +341,7 @@ namespace Mall.WebApi.Controllers.Education
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "GetArticleModel");
}
return ApiResult.Success("", oldLogisticsModel);
}
......
Mall.sln
View file @ 69d1c69b
......@@ -55,7 +55,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mall.Module.Education", "Ma
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mall.Module.Reserve", "Mall.Module.Reserve\Mall.Module.Reserve.csproj", "{449E8584-B4D1-4796-81EE-F7D70536C91D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mall.Module.TradePavilion", "Mall.Module.TradePavilion\Mall.Module.TradePavilion.csproj", "{3982D5CA-D5BF-45FD-BCDA-FF6694D409D3}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mall.Module.TradePavilion", "Mall.Module.TradePavilion\Mall.Module.TradePavilion.csproj", "{3982D5CA-D5BF-45FD-BCDA-FF6694D409D3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......
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