Skip to content

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

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

parents 49032125 56fae379
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 312 additions and 248 deletions
Mall.Model/Extend/Education/RB_Education_Teacher_Extend.cs
View file @ 8c5049a6
...@@ -44,13 +44,6 @@ namespace Mall.Model.Extend.Education ...@@ -44,13 +44,6 @@ namespace Mall.Model.Extend.Education
/// </summary> /// </summary>
public int GoodsNum { get; set; } public int GoodsNum { get; set; }
/// <summary>
/// 当前登录人id
/// </summary>
public int UserId { get; set; }
/// <summary> /// <summary>
/// 模板的时候查询老师信息 /// 模板的时候查询老师信息
/// </summary> /// </summary>
......
Mall.Module.MarketingCenter/MiniprogramTemplateModule.cs
View file @ 8c5049a6
...@@ -565,6 +565,7 @@ namespace Mall.Module.MarketingCenter ...@@ -565,6 +565,7 @@ namespace Mall.Module.MarketingCenter
} }
catch(Exception ex) catch(Exception ex)
{ {
Common.Plugin.LogHelper.Write(ex, "AnalyzePlusModule_educationteacher");
} }
item.data = educationTeacherModel; item.data = educationTeacherModel;
break; break;
......
Mall.Module.Product/OrderModule.cs
View file @ 8c5049a6
This diff is collapsed.
Mall.Module.Reserve/ReserveModule.cs
View file @ 8c5049a6
...@@ -490,6 +490,7 @@ namespace Mall.Module.Reserve ...@@ -490,6 +490,7 @@ namespace Mall.Module.Reserve
} }
catch (Exception ex) catch (Exception ex)
{ {
Common.Plugin.LogHelper.Write(ex, "AddOrUpdateServiceTargetDate");
return false; return false;
} }
} }
...@@ -662,76 +663,78 @@ namespace Mall.Module.Reserve ...@@ -662,76 +663,78 @@ namespace Mall.Module.Reserve
/// <param name="gradeId"></param> /// <param name="gradeId"></param>
/// <param name="uid"></param> /// <param name="uid"></param>
/// <returns></returns> /// <returns></returns>
public bool DelDiscountCoupon(int id, int uid, int mallBaseId) public virtual bool DelDiscountCoupon(int id, int uid, int mallBaseId)
{ {
var trans = discountCouponRepository.DbTransaction;
bool flag; bool flag;
try try
{ {
Dictionary<string, object> cols1 = new Dictionary<string, object>() Dictionary<string, object> cols1 = new Dictionary<string, object>()
{
{ nameof(RB_Reserve_Coupon.Status),1},
{ nameof(RB_Reserve_Coupon.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres1 = new List<WhereHelper>()
{
new WhereHelper()
{ {
{ nameof(RB_Reserve_Coupon.Status),1},
{ nameof(RB_Reserve_Coupon.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Reserve_Coupon.ID), FiledName=nameof(RB_Reserve_Coupon.ID),
FiledValue=id, FiledValue=id,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper()
{
FiledName=nameof(RB_Reserve_Coupon.TenantId), FiledName=nameof(RB_Reserve_Coupon.TenantId),
FiledValue=Convert.ToInt32(uid), FiledValue=Convert.ToInt32(uid),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper()
{
FiledName=nameof(RB_Reserve_Coupon.MallBaseId), FiledName=nameof(RB_Reserve_Coupon.MallBaseId),
FiledValue=Convert.ToInt32(mallBaseId), FiledValue=Convert.ToInt32(mallBaseId),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
flag = discountCouponRepository.Update(cols1, wheres1); flag = discountCouponRepository.Update(cols1, wheres1);
Dictionary<string, object> cols = new Dictionary<string, object>() Dictionary<string, object> cols = new Dictionary<string, object>()
{
{ nameof(RB_Reserve_Coupon.Status),1},
{ nameof(RB_Reserve_Coupon.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres = new List<WhereHelper>()
{
new WhereHelper()
{ {
{ nameof(RB_Reserve_Coupon.Status),1},
{ nameof(RB_Reserve_Coupon.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Reserve_CouponProduct.CouponId), FiledName=nameof(RB_Reserve_CouponProduct.CouponId),
FiledValue=id, FiledValue=id,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper()
{
FiledName=nameof(RB_Reserve_CouponProduct.TenantId), FiledName=nameof(RB_Reserve_CouponProduct.TenantId),
FiledValue=Convert.ToInt32(uid), FiledValue=Convert.ToInt32(uid),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper()
{
FiledName=nameof(RB_Reserve_CouponProduct.MallBaseId), FiledName=nameof(RB_Reserve_CouponProduct.MallBaseId),
FiledValue=Convert.ToInt32(mallBaseId), FiledValue=Convert.ToInt32(mallBaseId),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
productRepository.Update(cols, wheres); if (flag)
{
flag=productRepository.Update(cols, wheres);
discountCouponRepository.DBSession.Commit(); }
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.Write(ex, "DelDiscountCoupon"); LogHelper.Write(ex, "DelDiscountCoupon");
discountCouponRepository.DBSession.Rollback("DelDiscountCoupon"); flag=false;
return false;
} }
return flag; return flag;
} }
/// <summary> /// <summary>
/// 删除会员套餐卡 /// 删除会员套餐卡
/// </summary> /// </summary>
...@@ -1045,66 +1048,71 @@ namespace Mall.Module.Reserve ...@@ -1045,66 +1048,71 @@ namespace Mall.Module.Reserve
/// <returns></returns> /// <returns></returns>
public bool DelDiscountSelfMotion(int id, int uid, int mallBaseId) public bool DelDiscountSelfMotion(int id, int uid, int mallBaseId)
{ {
var trans = selfMotionRepository.DbTransaction;
bool flag; bool flag;
try try
{ {
Dictionary<string, object> cols1 = new Dictionary<string, object>() Dictionary<string, object> cols1 = new Dictionary<string, object>()
{
{ nameof(RB_Reserve_CouponSelfMotion.Status),1},
{ nameof(RB_Reserve_CouponSelfMotion.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres1 = new List<WhereHelper>()
{
new WhereHelper()
{ {
{ nameof(RB_Reserve_CouponSelfMotion.Status),1},
{ nameof(RB_Reserve_CouponSelfMotion.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres1 = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Reserve_CouponSelfMotion.ID), FiledName=nameof(RB_Reserve_CouponSelfMotion.ID),
FiledValue=id, FiledValue=id,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper()
{
FiledName=nameof(RB_Reserve_CouponSelfMotion.TenantId), FiledName=nameof(RB_Reserve_CouponSelfMotion.TenantId),
FiledValue=Convert.ToInt32(uid), FiledValue=Convert.ToInt32(uid),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper()
{
FiledName=nameof(RB_Reserve_CouponSelfMotion.MallBaseId), FiledName=nameof(RB_Reserve_CouponSelfMotion.MallBaseId),
FiledValue=Convert.ToInt32(mallBaseId), FiledValue=Convert.ToInt32(mallBaseId),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
flag = selfMotionRepository.Update(cols1, wheres1); flag = selfMotionRepository.Update(cols1, wheres1);
Dictionary<string, object> cols = new Dictionary<string, object>() Dictionary<string, object> cols = new Dictionary<string, object>()
{
{ nameof(RB_Reserve_CouponSelfMotionMember.Status),1},
{ nameof(RB_Reserve_CouponSelfMotionMember.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres = new List<WhereHelper>()
{
new WhereHelper()
{ {
{ nameof(RB_Reserve_CouponSelfMotionMember.Status),1},
{ nameof(RB_Reserve_CouponSelfMotionMember.UpdateDate),DateTime.Now},
};
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Reserve_CouponSelfMotionMember.SelfMotionId), FiledName=nameof(RB_Reserve_CouponSelfMotionMember.SelfMotionId),
FiledValue=id, FiledValue=id,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper()
{
FiledName=nameof(RB_Reserve_CouponSelfMotionMember.TenantId), FiledName=nameof(RB_Reserve_CouponSelfMotionMember.TenantId),
FiledValue=Convert.ToInt32(uid), FiledValue=Convert.ToInt32(uid),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
}, },
new WhereHelper(){ new WhereHelper()
{
FiledName=nameof(RB_Reserve_CouponSelfMotionMember.MallBaseId), FiledName=nameof(RB_Reserve_CouponSelfMotionMember.MallBaseId),
FiledValue=Convert.ToInt32(mallBaseId), FiledValue=Convert.ToInt32(mallBaseId),
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
} }
}; };
selfMotionMemberRepository.Update(cols, wheres); if (flag)
{
flag = selfMotionMemberRepository.Update(cols, wheres);
selfMotionRepository.DBSession.Commit(); }
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.Write(ex, "DelDiscountSelfMotion"); LogHelper.Write(ex, "DelDiscountSelfMotion");
selfMotionRepository.DBSession.Rollback("DelDiscountSelfMotion"); flag = false;
return false;
} }
return flag; return flag;
} }
......
Mall.Module.User/MiniProgramMsgModule.cs
View file @ 8c5049a6
...@@ -885,6 +885,7 @@ namespace Mall.Module.User ...@@ -885,6 +885,7 @@ namespace Mall.Module.User
} }
catch (Exception ex) catch (Exception ex)
{ {
Common.Plugin.LogHelper.Write(ex, "SendEducationDynamicMsg");
LogHelper.Write(string.Format("SendEducationDynamicMsg:wenXinResult:{0}", wenXinResult)); LogHelper.Write(string.Format("SendEducationDynamicMsg:wenXinResult:{0}", wenXinResult));
} }
if (successCount == OpenIds.Count()) if (successCount == OpenIds.Count())
...@@ -979,6 +980,7 @@ namespace Mall.Module.User ...@@ -979,6 +980,7 @@ namespace Mall.Module.User
} }
catch (Exception ex) catch (Exception ex)
{ {
LogHelper.Write(ex, "SendCourseOrderTplMsg");
LogHelper.Write(string.Format("SendCourseOrderTplMsg:wenXinResult:{0}", wenXinResult)); LogHelper.Write(string.Format("SendCourseOrderTplMsg:wenXinResult:{0}", wenXinResult));
} }
if (successCount == OpenIds.Count()) if (successCount == OpenIds.Count())
...@@ -1021,7 +1023,7 @@ namespace Mall.Module.User ...@@ -1021,7 +1023,7 @@ namespace Mall.Module.User
string Url = "https://api.weixin.qq.com/wxa/msg_sec_check?access_token=" + token; string Url = "https://api.weixin.qq.com/wxa/msg_sec_check?access_token=" + token;
var postdata = new var postdata = new
{ {
content = content content
}; };
wenXinResult = HttpHelper.HttpPost(Url, JsonHelper.Serialize(postdata), ""); wenXinResult = HttpHelper.HttpPost(Url, JsonHelper.Serialize(postdata), "");
LogHelper.WriteInfo("下单成功发送订阅消息:" + wenXinResult); LogHelper.WriteInfo("下单成功发送订阅消息:" + wenXinResult);
......
Mall.Module.User/RB_WeChatPublicAccountModule.cs
View file @ 8c5049a6
...@@ -48,13 +48,14 @@ namespace Mall.Module.User ...@@ -48,13 +48,14 @@ namespace Mall.Module.User
} }
catch (Exception ex) catch (Exception ex)
{ {
Common.Plugin.LogHelper.Write(ex, "SendOrderSucceedMsg_1");
try try
{ {
access_token = AccessTokenContainer.GetAccessTokenResult(appletWeChatModel.AppId).access_token; access_token = AccessTokenContainer.GetAccessTokenResult(appletWeChatModel.AppId).access_token;
} }
catch (Exception exs) catch (Exception exs)
{ {
Common.Plugin.LogHelper.Write(exs, "SendOrderSucceedMsg_2");
} }
} }
if (string.IsNullOrWhiteSpace(access_token)) if (string.IsNullOrWhiteSpace(access_token))
...@@ -107,6 +108,7 @@ namespace Mall.Module.User ...@@ -107,6 +108,7 @@ namespace Mall.Module.User
} }
catch (Exception ex) catch (Exception ex)
{ {
Common.Plugin.LogHelper.Write(ex, "SendOrderSucceedMsg_1");
} }
} }
} }
...@@ -114,6 +116,7 @@ namespace Mall.Module.User ...@@ -114,6 +116,7 @@ namespace Mall.Module.User
} }
catch (Exception ex) catch (Exception ex)
{ {
Common.Plugin.LogHelper.Write(ex, "SendOrderSucceedMsg_2");
return false; return false;
} }
} }
...@@ -149,13 +152,14 @@ namespace Mall.Module.User ...@@ -149,13 +152,14 @@ namespace Mall.Module.User
} }
catch (Exception ex) catch (Exception ex)
{ {
Common.Plugin.LogHelper.Write(ex, "SendOrderCancelMsg_1");
try try
{ {
access_token = AccessTokenContainer.GetAccessTokenResult(appletWeChatModel.AppId).access_token; access_token = AccessTokenContainer.GetAccessTokenResult(appletWeChatModel.AppId).access_token;
} }
catch (Exception exs) catch (Exception exs)
{ {
Common.Plugin.LogHelper.Write(exs, "SendOrderCancelMsg_2");
} }
} }
...@@ -201,6 +205,7 @@ namespace Mall.Module.User ...@@ -201,6 +205,7 @@ namespace Mall.Module.User
} }
catch (Exception ex) catch (Exception ex)
{ {
Common.Plugin.LogHelper.Write(ex, "SendOrderCancelMsg_3");
} }
} }
} }
...@@ -208,6 +213,7 @@ namespace Mall.Module.User ...@@ -208,6 +213,7 @@ namespace Mall.Module.User
} }
catch (Exception ex) catch (Exception ex)
{ {
Common.Plugin.LogHelper.Write(ex, "SendOrderCancelMsg_4");
return false; return false;
} }
} }
......
Mall.Module.User/UserCommonModule.cs
View file @ 8c5049a6
...@@ -432,10 +432,12 @@ namespace Mall.Module.User ...@@ -432,10 +432,12 @@ namespace Mall.Module.User
TransactionPriceInfo transactionPriceInfo = CacheManager.User.UserReidsCache.GetTransactionPriceInfo(oldOrder.MallBaseId); TransactionPriceInfo transactionPriceInfo = CacheManager.User.UserReidsCache.GetTransactionPriceInfo(oldOrder.MallBaseId);
if (transactionPriceInfo == null) if (transactionPriceInfo == null)
{ {
transactionPriceInfo = new TransactionPriceInfo(); transactionPriceInfo = new TransactionPriceInfo
transactionPriceInfo.TenantId = oldOrder.TenantId; {
transactionPriceInfo.MallBaseId = oldOrder.MallBaseId; TenantId = oldOrder.TenantId,
transactionPriceInfo.TotalPrice = totalPrice; MallBaseId = oldOrder.MallBaseId,
TotalPrice = totalPrice
};
} }
else else
{ {
...@@ -576,7 +578,7 @@ namespace Mall.Module.User ...@@ -576,7 +578,7 @@ namespace Mall.Module.User
//赠送粉象等级(+VIP返佣) ld 2020-08-03 //赠送粉象等级(+VIP返佣) ld 2020-08-03
var FXCOrder = oldOrder.RefMapperTo<RB_Goods_Order_Extend>(); var FXCOrder = oldOrder.RefMapperTo<RB_Goods_Order_Extend>();
FXCOrder.DetailList = orderGoodsList; FXCOrder.DetailList = orderGoodsList;
System.Threading.Tasks.Task.Run(() => InsertPresentFXGradeCommission(FXCOrder, Out_Trade_No, Transaction_Id, PayWay, oldOrder.UserId ?? 0, oldOrder.OrderId)); System.Threading.Tasks.Task.Run(() => InsertPresentFXGradeCommission(FXCOrder, Out_Trade_No,oldOrder.UserId ?? 0, oldOrder.OrderId));
if (oldOrder.OrderClassify == 2) if (oldOrder.OrderClassify == 2)
{ {
...@@ -610,7 +612,7 @@ namespace Mall.Module.User ...@@ -610,7 +612,7 @@ namespace Mall.Module.User
} }
catch (Exception ex) 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); 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);
...@@ -878,7 +880,7 @@ namespace Mall.Module.User ...@@ -878,7 +880,7 @@ namespace Mall.Module.User
//获取订单商品 //获取订单商品
var orderGoodsList = goodsOrderDetailRepository.GetOrderDetailList(new RB_Goods_OrderDetail_Extend { TenantId = oldOrder.TenantId, MallBaseId = oldOrder.MallBaseId, OrderId = oldOrder.OrderId }); var orderGoodsList = goodsOrderDetailRepository.GetOrderDetailList(new RB_Goods_OrderDetail_Extend { TenantId = oldOrder.TenantId, MallBaseId = oldOrder.MallBaseId, OrderId = oldOrder.OrderId });
oldOrder.DetailList = orderGoodsList; oldOrder.DetailList = orderGoodsList;
System.Threading.Tasks.Task.Run(() => InsertPresentFXGradeCommission(oldOrder, oldOrder.MerchantsNo, "", Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, oldOrder.UserId ?? 0, oldOrder.OrderId)); System.Threading.Tasks.Task.Run(() => InsertPresentFXGradeCommission(oldOrder, oldOrder.MerchantsNo,oldOrder.UserId ?? 0, oldOrder.OrderId));
} }
...@@ -888,7 +890,7 @@ namespace Mall.Module.User ...@@ -888,7 +890,7 @@ namespace Mall.Module.User
/// <param name="demodel"></param> /// <param name="demodel"></param>
/// <param name="umodel"></param> /// <param name="umodel"></param>
/// <param name="OrderId"></param> /// <param name="OrderId"></param>
private void InsertPresentFXGradeCommission(RB_Goods_Order_Extend demodel, string Out_Trade_No, string Transaction_Id, Common.Enum.Goods.OrderPayTypeEnum PayWay, int UserId, int OrderId) private void InsertPresentFXGradeCommission(RB_Goods_Order_Extend demodel, string Out_Trade_No, int UserId, int OrderId)
{ {
var basicModel = distributor_BasicsRepository.GetList(new RB_Distributor_Basics_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }).FirstOrDefault(); var basicModel = distributor_BasicsRepository.GetList(new RB_Distributor_Basics_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }).FirstOrDefault();
if ((basicModel?.IsEnableFXGrade ?? 2) == 1) if ((basicModel?.IsEnableFXGrade ?? 2) == 1)
...@@ -1444,8 +1446,7 @@ namespace Mall.Module.User ...@@ -1444,8 +1446,7 @@ namespace Mall.Module.User
/// <param name="OrderId">vip购买单号id</param> /// <param name="OrderId">vip购买单号id</param>
/// <param name="BuyUserId">购买人</param> /// <param name="BuyUserId">购买人</param>
/// <returns></returns> /// <returns></returns>
//public bool InsertVipBuyCommission(int OrderId, int BuyUserId,int IsFristBuy,int TenantId,int MallBaseId) public bool InsertVipBuyCommission(int BuyUserId, int OrderId, string Out_Trade_No,decimal Money, DateTime Time_End)
public bool InsertVipBuyCommission(int BuyUserId, int OrderId, string Out_Trade_No, string Transaction_Id, Common.Enum.Goods.OrderPayTypeEnum PayWay, decimal Money, DateTime Time_End)
{ {
bool flag = false; bool flag = false;
try try
......
Mall.WebApi/Controllers/AppletWeChat/WeChatNotifyController.cs
View file @ 8c5049a6
...@@ -24,14 +24,11 @@ namespace Mall.WebApi.Controllers.AppletWeChat ...@@ -24,14 +24,11 @@ namespace Mall.WebApi.Controllers.AppletWeChat
[EnableCors("AllowCors")] [EnableCors("AllowCors")]
public class WeChatNotifyController : Controller public class WeChatNotifyController : Controller
{ {
private static object _lock = new object(); private readonly object _lock = new object();
readonly UserCommonModule userCommonModule = new UserCommonModule();
UserCommonModule userCommonModule = new UserCommonModule(); readonly Module.MarketingCenter.RechargeModule rechargeModule = new Module.MarketingCenter.RechargeModule();
readonly Module.Education.PointModule pointModule = new Module.Education.PointModule();
//public UserModule userModule = new UserModule(); private readonly IHttpContextAccessor _accessor;
Module.MarketingCenter.RechargeModule rechargeModule = new Module.MarketingCenter.RechargeModule();
Module.Education.PointModule pointModule = new Module.Education.PointModule();
private IHttpContextAccessor _accessor;
/// <summary> /// <summary>
/// 构造函数 /// 构造函数
...@@ -185,8 +182,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat ...@@ -185,8 +182,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
#region 新增订单支付信息 #region 新增订单支付信息
// pointModule.UpdatePointOrder(UserId, OrderId, sOrderNo, TransactionId, Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, PayType, dPaid, PayDate); // pointModule.UpdatePointOrder(UserId, OrderId, sOrderNo, TransactionId, Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, PayType, dPaid, PayDate);
pointModule.UpdatePointOrder(new Model.Extend.Point.RB_Point_Order_Extend { ID= OrderId,OrderNo=sOrderNo,Income= dPaid ,MerchantsNo= TransactionId,PaymentTime= PayDate }); pointModule.UpdatePointOrder(new Model.Extend.Point.RB_Point_Order_Extend { ID = OrderId, OrderNo = sOrderNo, Income = dPaid, MerchantsNo = TransactionId, PaymentTime = PayDate });
#endregion #endregion
} }
...@@ -221,10 +218,10 @@ namespace Mall.WebApi.Controllers.AppletWeChat ...@@ -221,10 +218,10 @@ namespace Mall.WebApi.Controllers.AppletWeChat
var req = new RequestHandler(); var req = new RequestHandler();
App_Code.PayUtil PayUtil = new App_Code.PayUtil(); App_Code.PayUtil PayUtil = new App_Code.PayUtil();
var result = PayUtil.NotifyZhouTian(_accessor); var result = PayUtil.NotifyZhouTian(_accessor);
LogHelper.WriteInfo( "NotifyZhouTian返回信息进来了" ); LogHelper.WriteInfo("NotifyZhouTian返回信息进来了");
if (result.IsSuccess) if (result.IsSuccess)
{ {
LogHelper.WriteInfo( "NotifyZhouTian回调成功："+ result.ToString()); LogHelper.WriteInfo("NotifyZhouTian回调成功：" + result.ToString());
var dic = ((Dictionary<string, string>)result.Data); var dic = ((Dictionary<string, string>)result.Data);
//开始回写订单状态 //开始回写订单状态
lock (_lock) lock (_lock)
...@@ -240,7 +237,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat ...@@ -240,7 +237,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
DateTime PayDate = DateTime.ParseExact(dic["PayDate"], "yyyyMMddHHmmss", System.Globalization.CultureInfo.CurrentCulture);//转换时间// Convert.ToDateTime(dic["PayDate"]); DateTime PayDate = DateTime.ParseExact(dic["PayDate"], "yyyyMMddHHmmss", System.Globalization.CultureInfo.CurrentCulture);//转换时间// Convert.ToDateTime(dic["PayDate"]);
#region 新增订单支付信息 #region 新增订单支付信息
LogHelper.WriteInfo( "NotifyZhouTian订单信息"); LogHelper.WriteInfo("NotifyZhouTian订单信息");
userCommonModule.InsertOrderPayInfo(UserId, OrderId, sOrderNo, TransactionId, Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, PayType, dPaid, PayDate, 0); userCommonModule.InsertOrderPayInfo(UserId, OrderId, sOrderNo, TransactionId, Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, PayType, dPaid, PayDate, 0);
...@@ -350,7 +347,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat ...@@ -350,7 +347,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
#region 修改会员购买支付信息 #region 修改会员购买支付信息
userCommonModule.InsertVipBuyCommission(UserId, OrderId, sOrderNo, TransactionId, Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, dPaid, PayDate); userCommonModule.InsertVipBuyCommission(UserId, OrderId, sOrderNo, dPaid, PayDate);
#endregion #endregion
} }
//告诉微信我们已经处理成功，不需要再调用我们的接口了 //告诉微信我们已经处理成功，不需要再调用我们的接口了
......
Mall.WebApi/Controllers/AppletWeChat/WeChatPayController.cs
View file @ 8c5049a6
...@@ -33,7 +33,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat ...@@ -33,7 +33,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
[EnableCors("AllowCors")] [EnableCors("AllowCors")]
public class WeChatPayController : BaseController public class WeChatPayController : BaseController
{ {
private IHttpContextAccessor _accessor; private readonly IHttpContextAccessor _accessor;
/// <summary> /// <summary>
/// 构造函数 /// 构造函数
...@@ -47,7 +47,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat ...@@ -47,7 +47,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
/// <summary> /// <summary>
/// 商户小程序处理类 /// 商户小程序处理类
/// </summary> /// </summary>
private Module.User.MiniProgramModule programModule = new Module.User.MiniProgramModule(); private readonly MiniProgramModule programModule = new MiniProgramModule();
private readonly UserModule userModule = new UserModule(); private readonly UserModule userModule = new UserModule();
private readonly RechargeModule rechargeModule = new RechargeModule(); private readonly RechargeModule rechargeModule = new RechargeModule();
private readonly UserVipModule userVipModule = new UserVipModule(); private readonly UserVipModule userVipModule = new UserVipModule();
...@@ -501,8 +501,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat ...@@ -501,8 +501,7 @@ namespace Mall.WebApi.Controllers.AppletWeChat
public ApiResult TestReturn() public ApiResult TestReturn()
{ {
RB_MiniProgram_Extend miniProgram = new RB_MiniProgram_Extend(); //2020年5月26号新增 RB_MiniProgram_Extend miniProgram = new RB_MiniProgram_Extend { MiniAppId = "wx1bf3a7c76b10bb6d", WeChatApiSecret = "1e54ed9de09f99d87970aaf798cbc936", WeChatPayMerchants = "1554826431" };
miniProgram = new RB_MiniProgram_Extend { MiniAppId = "wx1bf3a7c76b10bb6d", WeChatApiSecret = "1e54ed9de09f99d87970aaf798cbc936", WeChatPayMerchants = "1554826431" }; // programModule.GetMiniProgramModule(new RB_MiniProgram_Extend { MallBaseId = 1, TenantId =1 });
string RefundOrderNo = "2020052916044326411"; string RefundOrderNo = "2020052916044326411";
var pram = new Common.Pay.WeChatPat.PayParam() var pram = new Common.Pay.WeChatPat.PayParam()
{ {
...@@ -545,10 +544,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat ...@@ -545,10 +544,8 @@ namespace Mall.WebApi.Controllers.AppletWeChat
public ApiResult TestTransfersOrder() public ApiResult TestTransfersOrder()
{ {
RB_MiniProgram_Extend miniProgram = new RB_MiniProgram_Extend(); //2020年5月26号新增 RB_MiniProgram_Extend miniProgram = new RB_MiniProgram_Extend { MiniAppId = "wxacd9f8cc3480d29e", WeChatApiSecret = "936110e2c2214340b9829a3608bde6b0", WeChatPayMerchants = "1562277941" };
miniProgram = new RB_MiniProgram_Extend { MiniAppId = "wxacd9f8cc3480d29e", WeChatApiSecret = "936110e2c2214340b9829a3608bde6b0", WeChatPayMerchants = "1562277941" }; // programModule.GetMiniProgramModule(new RB_MiniProgram_Extend { MallBaseId = 1, TenantId =1 });
string RefundOrderNo = "20200529160443264111"; string RefundOrderNo = "20200529160443264111";
var Robj = App_Code.PayUtil.GetTransfersOrder(RefundOrderNo, Convert.ToDecimal("0.01"), "21233", "ow_7I5XC1-RGwwk8QANBmWKYKmOc", miniProgram, _accessor); ; var Robj = App_Code.PayUtil.GetTransfersOrder(RefundOrderNo, Convert.ToDecimal("0.01"), "21233", "ow_7I5XC1-RGwwk8QANBmWKYKmOc", miniProgram, _accessor); ;
return ApiResult.Success("", Robj); return ApiResult.Success("", Robj);
} }
...@@ -568,45 +565,29 @@ namespace Mall.WebApi.Controllers.AppletWeChat ...@@ -568,45 +565,29 @@ namespace Mall.WebApi.Controllers.AppletWeChat
public ApiResult TestVIPBuyPayOrder() public ApiResult TestVIPBuyPayOrder()
{ {
RB_MiniProgram_Extend miniProgram = new RB_MiniProgram_Extend(); //2020年5月26号新增
miniProgram = new RB_MiniProgram_Extend { MiniAppId = "wxacd9f8cc3480d29e", WeChatApiSecret = "936110e2c2214340b9829a3608bde6b0", WeChatPayMerchants = "1562277941" }; // programModule.GetMiniProgramModule(new RB_MiniProgram_Extend { MallBaseId = 1, TenantId =1 });
string RefundOrderNo = System.DateTime.Now.ToString("yyyyMMddHHmmssfff");
// var parmsInfo = RequestParm;
JObject parms = JObject.Parse(RequestParm.msg.ToString()); JObject parms = JObject.Parse(RequestParm.msg.ToString());
string orderNo = parms.GetStringValue("orderNo"); string orderNo = parms.GetStringValue("orderNo");
int orderId = parms.GetInt("orderId"); int orderId = parms.GetInt("orderId");
int userId = parms.GetInt("userId"); int userId = parms.GetInt("userId");
var Robj = userCommonModule.InsertVipBuyCommission(userId, orderId, orderNo, orderNo + "1111", Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, Convert.ToDecimal(365.00), System.DateTime.Now); var Robj = userCommonModule.InsertVipBuyCommission(userId, orderId, orderNo,Convert.ToDecimal(365.00), System.DateTime.Now);
return ApiResult.Success("", Robj); return ApiResult.Success("", Robj);
} }
public ApiResult InsertOrderPayInfo() public ApiResult InsertOrderPayInfo()
{ {
var request = RequestParm; var request = RequestParm;
var userInfo = AppletUserInfo;
RB_Goods_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Order_Extend>(request.msg.ToString()); RB_Goods_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Order_Extend>(request.msg.ToString());
userCommonModule.InsertOrderPayInfo(demodel.UserId ?? 0, demodel.OrderId, demodel.OrderNo, "s1111111111111", Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, "test", (demodel.Income ?? 0), System.DateTime.Now, 0); userCommonModule.InsertOrderPayInfo(demodel.UserId ?? 0, demodel.OrderId, demodel.OrderNo, "s1111111111111", Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, "test", (demodel.Income ?? 0), System.DateTime.Now, 0);
return ApiResult.Success(""); return ApiResult.Success("");
} }
public ApiResult TestUpdatePointOrder() public ApiResult TestUpdatePointOrder()
{ {
var request = RequestParm; var request = RequestParm;
var userInfo = AppletUserInfo;
RB_Point_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Point_Order_Extend>(request.msg.ToString()); RB_Point_Order_Extend demodel = JsonConvert.DeserializeObject<RB_Point_Order_Extend>(request.msg.ToString());
//ID = OrderId, OrderNo = sOrderNo, Income = dPaid, MerchantsNo = TransactionId, PaymentTime = PayDate
pointModule.UpdatePointOrder(demodel); pointModule.UpdatePointOrder(demodel);
return ApiResult.Success(""); return ApiResult.Success("");
} }
#endregion #endregion
} }
} }
\ No newline at end of file
Mall.WebApi/Controllers/Education/AppletEducationController.cs
View file @ 8c5049a6
...@@ -34,9 +34,9 @@ namespace Mall.WebApi.Controllers.Education ...@@ -34,9 +34,9 @@ namespace Mall.WebApi.Controllers.Education
{ {
private readonly EducationModule educationModule = new EducationModule(); private readonly EducationModule educationModule = new EducationModule();
private readonly DynamicModule dynamicModule = new DynamicModule(); private readonly DynamicModule dynamicModule = new DynamicModule();
private Module.User.UserModule UserModule = new Module.User.UserModule(); private readonly UserModule UserModule = new UserModule();
private Module.Product.ProductModule productModule = new Module.Product.ProductModule(); private readonly Module.Product.ProductModule productModule = new Module.Product.ProductModule();
private readonly Module.User.MiniProgramModule programModule = new Module.User.MiniProgramModule(); private readonly MiniProgramModule programModule = new MiniProgramModule();
private readonly Module.MarketingCenter.SurveyModule surveyModule = new Module.MarketingCenter.SurveyModule(); private readonly Module.MarketingCenter.SurveyModule surveyModule = new Module.MarketingCenter.SurveyModule();
#region 课程卡 #region 课程卡
...@@ -87,7 +87,6 @@ namespace Mall.WebApi.Controllers.Education ...@@ -87,7 +87,6 @@ namespace Mall.WebApi.Controllers.Education
[HttpPost] [HttpPost]
public ApiResult GrantCoupon() public ApiResult GrantCoupon()
{ {
var parms = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
var query = JsonConvert.DeserializeObject<RB_Education_MemberCoupon_Extend>(RequestParm.msg.ToString()); var query = JsonConvert.DeserializeObject<RB_Education_MemberCoupon_Extend>(RequestParm.msg.ToString());
query.TenantId = userInfo.TenantId; query.TenantId = userInfo.TenantId;
...@@ -149,20 +148,22 @@ namespace Mall.WebApi.Controllers.Education ...@@ -149,20 +148,22 @@ namespace Mall.WebApi.Controllers.Education
} }
RB_Education_MemberCoupon_Extend memberCoupon = new RB_Education_MemberCoupon_Extend(); RB_Education_MemberCoupon_Extend memberCoupon = new RB_Education_MemberCoupon_Extend
memberCoupon.Id = 0; {
memberCoupon.UserId = userInfo.UserId; Id = 0,
memberCoupon.Description = oldLogisticsModel.Describe; UserId = userInfo.UserId,
memberCoupon.CreateDate = System.DateTime.Now; Description = oldLogisticsModel.Describe,
memberCoupon.TenantId = userInfo.TenantId; CreateDate = System.DateTime.Now,
memberCoupon.MallBaseId = userInfo.MallBaseId; TenantId = userInfo.TenantId,
memberCoupon.Remarks = ""; MallBaseId = userInfo.MallBaseId,
memberCoupon.CouponId = oldLogisticsModel.ID; Remarks = "",
memberCoupon.Name = oldLogisticsModel.Name; CouponId = oldLogisticsModel.ID,
memberCoupon.HeXiao = oldLogisticsModel.HeXiao; Name = oldLogisticsModel.Name,
memberCoupon.UseHeXiao = 0; HeXiao = oldLogisticsModel.HeXiao,
memberCoupon.UseType = oldLogisticsModel.UseType; UseHeXiao = 0,
if (oldLogisticsModel.IndateType == Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon) UseType = oldLogisticsModel.UseType
};
if (oldLogisticsModel.IndateType == IndateTypeEnum.DayHorizon)
{ {
memberCoupon.StartDate = System.DateTime.Now; memberCoupon.StartDate = System.DateTime.Now;
LogHelper.WriteInfo(userInfo.Name + "课程卡领取时间:" + memberCoupon.StartDate); LogHelper.WriteInfo(userInfo.Name + "课程卡领取时间:" + memberCoupon.StartDate);
...@@ -173,8 +174,10 @@ namespace Mall.WebApi.Controllers.Education ...@@ -173,8 +174,10 @@ namespace Mall.WebApi.Controllers.Education
memberCoupon.StartDate = oldLogisticsModel.StartDate; memberCoupon.StartDate = oldLogisticsModel.StartDate;
memberCoupon.EndDate = oldLogisticsModel.EndDate; memberCoupon.EndDate = oldLogisticsModel.EndDate;
} }
var memberList = new List<RB_Education_MemberCoupon_Extend>(); var memberList = new List<RB_Education_MemberCoupon_Extend>
memberList.Add(memberCoupon); {
memberCoupon
};
bool result = educationModule.GrantCoupon(memberList, oldLogisticsModel); bool result = educationModule.GrantCoupon(memberList, oldLogisticsModel);
if (result) if (result)
{ {
...@@ -230,16 +233,14 @@ namespace Mall.WebApi.Controllers.Education ...@@ -230,16 +233,14 @@ namespace Mall.WebApi.Controllers.Education
[HttpPost] [HttpPost]
public ApiResult ShareEducationCoupon() public ApiResult ShareEducationCoupon()
{ {
var parms = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
var query = JsonConvert.DeserializeObject<RB_Education_Coupon_Extend>(RequestParm.msg.ToString()); var query = JsonConvert.DeserializeObject<RB_Education_Coupon_Extend>(RequestParm.msg.ToString());
query.TenantId = userInfo.TenantId; query.TenantId = userInfo.TenantId;
query.MallBaseId = userInfo.MallBaseId; query.MallBaseId = userInfo.MallBaseId;
query.UserId = userInfo.UserId; query.UserId = userInfo.UserId;
RB_Education_Coupon_Extend resultModel = new RB_Education_Coupon_Extend(); RB_Education_Coupon_Extend resultModel;
if (query.TriggerType == 2) if (query.TriggerType == 2)
{ {
query.TriggerType = 4; query.TriggerType = 4;
resultModel = educationModule.AutoEducationCoupon(query); resultModel = educationModule.AutoEducationCoupon(query);
if (resultModel == null || resultModel.ID == 0) if (resultModel == null || resultModel.ID == 0)
...@@ -450,7 +451,6 @@ namespace Mall.WebApi.Controllers.Education ...@@ -450,7 +451,6 @@ namespace Mall.WebApi.Controllers.Education
JObject parms = JObject.Parse(req.msg.ToString()); JObject parms = JObject.Parse(req.msg.ToString());
int GoodsId = parms.GetInt("GoodsId", 0); int GoodsId = parms.GetInt("GoodsId", 0);
int Time = parms.GetInt("Time", 10);//秒 int Time = parms.GetInt("Time", 10);//秒
int CourseId = parms.GetInt("CourseId", 0);//课程id
if (GoodsId <= 0) if (GoodsId <= 0)
{ {
return ApiResult.ParamIsNull("请传递课程id"); return ApiResult.ParamIsNull("请传递课程id");
...@@ -792,7 +792,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -792,7 +792,7 @@ namespace Mall.WebApi.Controllers.Education
} }
catch (Exception ex) catch (Exception ex)
{ {
Common.Plugin.LogHelper.Write(ex, "InsertOrderPayInfo");
return ApiResult.Failed("评论内容检测失败，请稍后再试"); return ApiResult.Failed("评论内容检测失败，请稍后再试");
} }
#endregion #endregion
...@@ -1621,7 +1621,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -1621,7 +1621,7 @@ namespace Mall.WebApi.Controllers.Education
} }
catch (Exception ex) catch (Exception ex)
{ {
Common.Plugin.LogHelper.Write(ex, "GetDynamicComment");
return ApiResult.Failed("评论内容检测失败，请稍后再试"); return ApiResult.Failed("评论内容检测失败，请稍后再试");
} }
#endregion #endregion
...@@ -1674,7 +1674,6 @@ namespace Mall.WebApi.Controllers.Education ...@@ -1674,7 +1674,6 @@ namespace Mall.WebApi.Controllers.Education
[HttpPost] [HttpPost]
public ApiResult GetDynamicMessageCount() public ApiResult GetDynamicMessageCount()
{ {
var req = RequestParm;
var userInfo = AppletUserInfo; var userInfo = AppletUserInfo;
int messageCount = 0; int messageCount = 0;
if (userInfo != null && userInfo.UserId > 0) if (userInfo != null && userInfo.UserId > 0)
......
Mall.WebApi/Controllers/Education/AppletSchoolController.cs
View file @ 8c5049a6
...@@ -26,7 +26,6 @@ namespace Mall.WebApi.Controllers.Education ...@@ -26,7 +26,6 @@ namespace Mall.WebApi.Controllers.Education
{ {
private readonly EducationModule educationModule = new EducationModule(); private readonly EducationModule educationModule = new EducationModule();
private readonly ProductModule productModule = new ProductModule(); private readonly ProductModule productModule = new ProductModule();
private Module.User.UserModule UserModule = new Module.User.UserModule();
private readonly DynamicModule dynamicModule = new DynamicModule(); private readonly DynamicModule dynamicModule = new DynamicModule();
#region 课程 #region 课程
...@@ -342,8 +341,7 @@ namespace Mall.WebApi.Controllers.Education ...@@ -342,8 +341,7 @@ namespace Mall.WebApi.Controllers.Education
} }
catch (Exception ex) catch (Exception ex)
{ {
Common.Plugin.LogHelper.Write(ex, "GetArticleModel");
} }
return ApiResult.Success("", oldLogisticsModel); return ApiResult.Success("", oldLogisticsModel);
} }
......
Mall.WebApi/Controllers/Education/PointController.cs
View file @ 8c5049a6
...@@ -234,7 +234,6 @@ namespace Mall.WebApi.Controllers.Education ...@@ -234,7 +234,6 @@ namespace Mall.WebApi.Controllers.Education
[HttpPost] [HttpPost]
public ApiResult GetPointOrderPageList() public ApiResult GetPointOrderPageList()
{ {
var parms = RequestParm;
var userInfo = UserInfo; var userInfo = UserInfo;
ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString()); ResultPageModel pagelist = JsonConvert.DeserializeObject<ResultPageModel>(RequestParm.msg.ToString());
RB_Point_TeacherCourseOrder_Extend demodel = JsonConvert.DeserializeObject<RB_Point_TeacherCourseOrder_Extend>(RequestParm.msg.ToString()); RB_Point_TeacherCourseOrder_Extend demodel = JsonConvert.DeserializeObject<RB_Point_TeacherCourseOrder_Extend>(RequestParm.msg.ToString());
...@@ -314,7 +313,81 @@ namespace Mall.WebApi.Controllers.Education ...@@ -314,7 +313,81 @@ namespace Mall.WebApi.Controllers.Education
}); });
} }
/// <summary>
/// 约课订单excel下载
/// </summary>
[HttpPost]
public FileContentResult GetPointOrderListToExcel()
{
var userInfo = UserInfo;
RB_Point_TeacherCourseOrder_Extend demodel = JsonConvert.DeserializeObject<RB_Point_TeacherCourseOrder_Extend>(RequestParm.msg.ToString());
string ExcelName = "约课列表" + DateTime.Now.ToString("yyyyMMddHHmmss") + ".xls";
List<ExcelDataSource> slist = new List<ExcelDataSource>();
ExcelDataSource header = new ExcelDataSource()
{
ExcelRows = new List<ExcelColumn>(30) {
new ExcelColumn(value: "单号") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "课程分类") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "课程名称") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "教师") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "学习时间") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "学习时长") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "学习总时长") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "房间信息") { CellWidth = 25, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "总点数") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "实际点数") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "基础点数") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "用户名称") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "报名时间") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
new ExcelColumn(value: "状态") { CellWidth = 15, HAlignmentEnum = HAlignmentEnum.CENTER, VAlignmentEnum = VAlignmentEnum.CENTER },
}
};
slist.Add(header);
try
{
demodel.TenantId = userInfo.TenantId;
demodel.MallBaseId = userInfo.MallBaseId;
var list = pointModule.GetPointOrderPageList(1, 99999, out long count, demodel);
#region 组装数据
foreach (var item in list)
{
ExcelDataSource datarow = new ExcelDataSource()
{
ExcelRows = new List<ExcelColumn>(30) {
new ExcelColumn(value:item.ID.ToString()){ },
new ExcelColumn(value:item.CourseClassType.GetEnumName()){ },
new ExcelColumn(value:item.CourseName){ },
new ExcelColumn(value:item.TeacherName){ },
new ExcelColumn(value:item.StudyDate.ToString("yyyy-MM-dd HH:mm")){ },
new ExcelColumn(value:item.StudyDuration.ToString()){ },
new ExcelColumn(value:item.TotalStudyDuration.ToString()){ },
new ExcelColumn(value:item.RoomInfo){ },
new ExcelColumn(value:item.TotalPointNum.ToString()){ },
new ExcelColumn(value:item.ActualPointNum.ToString()){ },
new ExcelColumn(value:item.BasePointNum.ToString()){ },
new ExcelColumn(value:item.UserName + "("+item.UserId.ToString()+")"){ },
new ExcelColumn(value:(item.CreateDate.HasValue ? item.CreateDate.Value.ToString("yyyy-MM-dd HH:mm:ss") : "")){ },
new ExcelColumn(value:item.OrderStaus.GetEnumName()){ },
},
ColumnHight = 30
};
slist.Add(datarow);
}
#endregion
var byteData = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData, "application/octet-stream", ExcelName);
}
catch (Exception ex)
{
LogHelper.Write(ex, string.Format("GetFileFromWebApi_requestData: {0}", JsonHelper.Serialize(RequestParm)));
var byteData1 = ExcelTempLateHelper.ToExcelExtend(slist);
return File(byteData1, "application/octet-stream", ExcelName);
}
}
......
Mall.WebApi/Controllers/Finance/ERPOrderCommissionController.cs
View file @ 8c5049a6
...@@ -405,7 +405,7 @@ namespace Mall.WebApi.Controllers.Finance ...@@ -405,7 +405,7 @@ namespace Mall.WebApi.Controllers.Finance
return ApiResult.ParamIsNull("只能修改和平的"); return ApiResult.ParamIsNull("只能修改和平的");
} }
bool flag = orderModule.SetECUpdateOrderOtherMoney(model, Money, OtherType, Type, Remark); bool flag = orderModule.SetECUpdateOrderOtherMoney(model, Money, OtherType, Type);
if (flag) if (flag)
{ {
return ApiResult.Success(); return ApiResult.Success();
......
Mall.WebApi/Controllers/Product/AppletOrderController.cs
View file @ 8c5049a6
...@@ -1032,7 +1032,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1032,7 +1032,7 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.ParamIsNull(); return ApiResult.ParamIsNull();
} }
return orderModule.GetAppletMyOrderAfterSaleInfo(OrderDetailId, userInfo.UserId, userInfo.TenantId, userInfo.MallBaseId); return orderModule.GetAppletMyOrderAfterSaleInfo(OrderDetailId);
} }
/// <summary> /// <summary>
...@@ -1137,7 +1137,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1137,7 +1137,7 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.ParamIsNull(); return ApiResult.ParamIsNull();
} }
return orderModule.GetAppletOrderBuyerToDeliverInfo(ReOrderId, userInfo.TenantId, userInfo.MallBaseId); return orderModule.GetAppletOrderBuyerToDeliverInfo(ReOrderId);
} }
/// <summary> /// <summary>
......
Mall.WebApi/Controllers/Product/OrderController.cs
View file @ 8c5049a6
...@@ -842,7 +842,6 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -842,7 +842,6 @@ namespace Mall.WebApi.Controllers.MallBase
int Type = parms.GetInt("Type", 0);//类型 1修改备注 2修改金额 3强制取消 4放入回收站 5确认收货 6确认完成 7回收恢复 8回收删除 int Type = parms.GetInt("Type", 0);//类型 1修改备注 2修改金额 3强制取消 4放入回收站 5确认收货 6确认完成 7回收恢复 8回收删除
string Remark = parms.GetStringValue("Remark"); string Remark = parms.GetStringValue("Remark");
decimal Income = parms.GetDecimal("Income"); decimal Income = parms.GetDecimal("Income");
string Address = parms.GetStringValue("Address");
if (OrderId <= 0) if (OrderId <= 0)
{ {
return ApiResult.ParamIsNull("请传递id"); return ApiResult.ParamIsNull("请传递id");
...@@ -937,7 +936,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -937,7 +936,7 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.ParamIsNull("参数有误"); return ApiResult.ParamIsNull("参数有误");
} }
bool flag = orderModule.SetOrderOperation(omodel, Type, Remark, Income, Address, req.TenantId, req.MallBaseId, _accessor); bool flag = orderModule.SetOrderOperation(omodel, Type, Remark, Income, req.TenantId, req.MallBaseId, _accessor);
if (flag) if (flag)
{ {
return ApiResult.Success(); return ApiResult.Success();
...@@ -1031,10 +1030,12 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1031,10 +1030,12 @@ namespace Mall.WebApi.Controllers.MallBase
TransactionPriceInfo transactionPriceInfo = CacheManager.User.UserReidsCache.GetTransactionPriceInfo(omodel.MallBaseId); TransactionPriceInfo transactionPriceInfo = CacheManager.User.UserReidsCache.GetTransactionPriceInfo(omodel.MallBaseId);
if (transactionPriceInfo == null) if (transactionPriceInfo == null)
{ {
transactionPriceInfo = new TransactionPriceInfo(); transactionPriceInfo = new TransactionPriceInfo
transactionPriceInfo.TenantId = omodel.TenantId; {
transactionPriceInfo.MallBaseId = omodel.MallBaseId; TenantId = omodel.TenantId,
transactionPriceInfo.TotalPrice = (omodel.Income ?? 0) * -1; MallBaseId = omodel.MallBaseId,
TotalPrice = (omodel.Income ?? 0) * -1
};
} }
else else
{ {
...@@ -1301,10 +1302,12 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1301,10 +1302,12 @@ namespace Mall.WebApi.Controllers.MallBase
TransactionPriceInfo transactionPriceInfo = CacheManager.User.UserReidsCache.GetTransactionPriceInfo(omodel.MallBaseId); TransactionPriceInfo transactionPriceInfo = CacheManager.User.UserReidsCache.GetTransactionPriceInfo(omodel.MallBaseId);
if (transactionPriceInfo == null) if (transactionPriceInfo == null)
{ {
transactionPriceInfo = new TransactionPriceInfo(); transactionPriceInfo = new TransactionPriceInfo
transactionPriceInfo.TenantId = omodel.TenantId; {
transactionPriceInfo.MallBaseId = omodel.MallBaseId; TenantId = omodel.TenantId,
transactionPriceInfo.TotalPrice = (omodel.Income ?? 0) * -1; MallBaseId = omodel.MallBaseId,
TotalPrice = (omodel.Income ?? 0) * -1
};
} }
else else
{ {
...@@ -2978,7 +2981,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -2978,7 +2981,7 @@ namespace Mall.WebApi.Controllers.MallBase
Name = y.OrderIntroduction?.Name ?? "", Name = y.OrderIntroduction?.Name ?? "",
Commission = y.OrderIntroduction?.Commission ?? 0, Commission = y.OrderIntroduction?.Commission ?? 0,
CommissionState = y.OrderIntroduction?.CommissionState ?? 1, CommissionState = y.OrderIntroduction?.CommissionState ?? 1,
Remark = y.OrderIntroduction?.Remark, y.OrderIntroduction?.Remark,
} }
}), }),
x.Consignee, x.Consignee,
...@@ -3217,7 +3220,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -3217,7 +3220,7 @@ namespace Mall.WebApi.Controllers.MallBase
Name = y.SmallShopsCommission?.Name ?? "", Name = y.SmallShopsCommission?.Name ?? "",
Commission = y.SmallShopsCommission?.Commission ?? 0, Commission = y.SmallShopsCommission?.Commission ?? 0,
CommissionState = y.SmallShopsCommission?.CommissionState ?? 1, CommissionState = y.SmallShopsCommission?.CommissionState ?? 1,
Remark = y.SmallShopsCommission?.Remark, y.SmallShopsCommission?.Remark,
} }
}), }),
x.Consignee, x.Consignee,
...@@ -3817,10 +3820,12 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -3817,10 +3820,12 @@ namespace Mall.WebApi.Controllers.MallBase
TransactionPriceInfo transactionPriceInfo = CacheManager.User.UserReidsCache.GetTransactionPriceInfo(detailModel.MallBaseId); TransactionPriceInfo transactionPriceInfo = CacheManager.User.UserReidsCache.GetTransactionPriceInfo(detailModel.MallBaseId);
if (transactionPriceInfo == null) if (transactionPriceInfo == null)
{ {
transactionPriceInfo = new TransactionPriceInfo(); transactionPriceInfo = new TransactionPriceInfo
transactionPriceInfo.TenantId = orderModel.TenantId; {
transactionPriceInfo.MallBaseId = orderModel.MallBaseId; TenantId = orderModel.TenantId,
transactionPriceInfo.TotalPrice = Refund * -1; MallBaseId = orderModel.MallBaseId,
TotalPrice = Refund * -1
};
} }
else else
{ {
...@@ -4005,10 +4010,12 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -4005,10 +4010,12 @@ namespace Mall.WebApi.Controllers.MallBase
TransactionPriceInfo transactionPriceInfo = CacheManager.User.UserReidsCache.GetTransactionPriceInfo(orderModel.MallBaseId); TransactionPriceInfo transactionPriceInfo = CacheManager.User.UserReidsCache.GetTransactionPriceInfo(orderModel.MallBaseId);
if (transactionPriceInfo == null) if (transactionPriceInfo == null)
{ {
transactionPriceInfo = new TransactionPriceInfo(); transactionPriceInfo = new TransactionPriceInfo
transactionPriceInfo.TenantId = orderModel.TenantId; {
transactionPriceInfo.MallBaseId = orderModel.MallBaseId; TenantId = orderModel.TenantId,
transactionPriceInfo.TotalPrice = Refund * -1; MallBaseId = orderModel.MallBaseId,
TotalPrice = Refund * -1
};
} }
else else
{ {
......
Mall.WebApi/Controllers/Reserve/ReserveController.cs
View file @ 8c5049a6
...@@ -28,8 +28,8 @@ namespace Mall.WebApi.Controllers.Reserve ...@@ -28,8 +28,8 @@ namespace Mall.WebApi.Controllers.Reserve
public class ReserveController : BaseController public class ReserveController : BaseController
{ {
private readonly ReserveModule reserveModule = new ReserveModule(); private readonly ReserveModule reserveModule =AOPHelper.CreateAOPObject<ReserveModule>();
private Module.User.UserModule UserModule = new Module.User.UserModule(); private readonly Module.User.UserModule UserModule = new Module.User.UserModule();
/// <summary> /// <summary>
/// 门店处理类对象 /// 门店处理类对象
/// </summary> /// </summary>
...@@ -338,7 +338,6 @@ namespace Mall.WebApi.Controllers.Reserve ...@@ -338,7 +338,6 @@ namespace Mall.WebApi.Controllers.Reserve
[HttpPost] [HttpPost]
public ApiResult GetServiceTargetDateList() public ApiResult GetServiceTargetDateList()
{ {
var parms = RequestParm;
var query = JsonConvert.DeserializeObject<RB_Reserve_ServiceTargetDate_Extend>(RequestParm.msg.ToString()); var query = JsonConvert.DeserializeObject<RB_Reserve_ServiceTargetDate_Extend>(RequestParm.msg.ToString());
var list = reserveModule.GetServiceTargetDateList(query); var list = reserveModule.GetServiceTargetDateList(query);
List<string> result = new List<string>(); List<string> result = new List<string>();
...@@ -464,10 +463,11 @@ namespace Mall.WebApi.Controllers.Reserve ...@@ -464,10 +463,11 @@ namespace Mall.WebApi.Controllers.Reserve
var oldLogisticsModel = reserveModule.GetDiscountCouponList(query).FirstOrDefault(); var oldLogisticsModel = reserveModule.GetDiscountCouponList(query).FirstOrDefault();
if (oldLogisticsModel == null) if (oldLogisticsModel == null)
{ {
oldLogisticsModel = new RB_Reserve_Coupon_Extend(); oldLogisticsModel = new RB_Reserve_Coupon_Extend
oldLogisticsModel.IndateType = Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon; {
IndateType = Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon
};
} }
return ApiResult.Success("", oldLogisticsModel); return ApiResult.Success("", oldLogisticsModel);
} }
...@@ -643,19 +643,21 @@ namespace Mall.WebApi.Controllers.Reserve ...@@ -643,19 +643,21 @@ namespace Mall.WebApi.Controllers.Reserve
{ {
if (!string.IsNullOrWhiteSpace(item)) if (!string.IsNullOrWhiteSpace(item))
{ {
RB_Reserve_MemberCoupon_Extend memberCoupon = new RB_Reserve_MemberCoupon_Extend(); RB_Reserve_MemberCoupon_Extend memberCoupon = new RB_Reserve_MemberCoupon_Extend
memberCoupon.Id = 0; {
memberCoupon.UserId = Convert.ToInt32(item); Id = 0,
memberCoupon.Description = oldLogisticsModel.Describe; UserId = Convert.ToInt32(item),
memberCoupon.CreateDate = System.DateTime.Now; Description = oldLogisticsModel.Describe,
memberCoupon.TenantId = oldLogisticsModel.TenantId; CreateDate = System.DateTime.Now,
memberCoupon.MallBaseId = oldLogisticsModel.MallBaseId; TenantId = oldLogisticsModel.TenantId,
memberCoupon.Remarks = ""; MallBaseId = oldLogisticsModel.MallBaseId,
memberCoupon.CouponId = oldLogisticsModel.ID; Remarks = "",
memberCoupon.Name = oldLogisticsModel.Name; CouponId = oldLogisticsModel.ID,
memberCoupon.UseType = oldLogisticsModel.UseType; Name = oldLogisticsModel.Name,
memberCoupon.HeXiao = oldLogisticsModel.HeXiao; UseType = oldLogisticsModel.UseType,
memberCoupon.UseHeXiao = 0; HeXiao = oldLogisticsModel.HeXiao,
UseHeXiao = 0
};
if (oldLogisticsModel.IndateType == Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon) if (oldLogisticsModel.IndateType == Common.Enum.MarketingCenter.IndateTypeEnum.DayHorizon)
{ {
memberCoupon.StartDate = System.DateTime.Now; memberCoupon.StartDate = System.DateTime.Now;
...@@ -1022,20 +1024,22 @@ namespace Mall.WebApi.Controllers.Reserve ...@@ -1022,20 +1024,22 @@ namespace Mall.WebApi.Controllers.Reserve
var tempOrderList = orderList.Where(x => x.ServicepersonalId == item.Id && day <= Convert.ToDateTime(x.ServiceDate + " " + x.ServiceTime) && Convert.ToDateTime(x.ServiceDate + " " + x.ServiceTime) < day.AddMinutes(30)); var tempOrderList = orderList.Where(x => x.ServicepersonalId == item.Id && day <= Convert.ToDateTime(x.ServiceDate + " " + x.ServiceTime) && Convert.ToDateTime(x.ServiceDate + " " + x.ServiceTime) < day.AddMinutes(30));
foreach (var itemOrder in tempOrderList) foreach (var itemOrder in tempOrderList)
{ {
OrderKanBan orderModel = new OrderKanBan(); OrderKanBan orderModel = new OrderKanBan
orderModel.Id = item.Id; {
orderModel.Name = item.Name; Id = item.Id,
orderModel.GoodsName = itemOrder.GoodsName; Name = item.Name,
orderModel.ServiceTime = itemOrder.ServiceTime; GoodsName = itemOrder.GoodsName,
orderModel.SystemServiceTime = nowTimeInfo; ServiceTime = itemOrder.ServiceTime,
orderModel.GoodServiceTime = itemOrder.GoodServiceTime; SystemServiceTime = nowTimeInfo,
orderModel.UserName = itemOrder.UserName; GoodServiceTime = itemOrder.GoodServiceTime,
orderModel.UserPhoto = itemOrder.UserPhoto; UserName = itemOrder.UserName,
orderModel.OrderId = itemOrder.OrderId ?? 0; UserPhoto = itemOrder.UserPhoto,
orderModel.OrderDetailId = itemOrder.Id; OrderId = itemOrder.OrderId ?? 0,
orderModel.Number = itemOrder.Number ?? 0; OrderDetailId = itemOrder.Id,
orderModel.BuyerMessage = itemOrder.BuyerMessage; Number = itemOrder.Number ?? 0,
orderModel.Mobile = itemOrder.Mobile; BuyerMessage = itemOrder.BuyerMessage,
Mobile = itemOrder.Mobile
};
item.OrderList.Add(orderModel); item.OrderList.Add(orderModel);
} }
} }
......
Mall.sln
View file @ 8c5049a6
...@@ -55,7 +55,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mall.Module.Education", "Ma ...@@ -55,7 +55,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mall.Module.Education", "Ma
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mall.Module.Reserve", "Mall.Module.Reserve\Mall.Module.Reserve.csproj", "{449E8584-B4D1-4796-81EE-F7D70536C91D}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mall.Module.Reserve", "Mall.Module.Reserve\Mall.Module.Reserve.csproj", "{449E8584-B4D1-4796-81EE-F7D70536C91D}"
EndProject 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 EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution 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