Skip to content

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

提交和平商旅定金

parent a8e075cd
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1057 additions and 314 deletions
Mall.Model/Entity/Product/RB_Goods.cs
View file @ 47744e02
...@@ -647,7 +647,7 @@ namespace Mall.Model.Entity.Product ...@@ -647,7 +647,7 @@ namespace Mall.Model.Entity.Product
/// <summary> /// <summary>
/// 创建人1 /// 创建人1
/// </summary> /// </summary>
public int CreateBy { get => create_by; set => create_by= value; } public int CreateBy { get => create_by; set => create_by = value; }
/// <summary> /// <summary>
/// 教育商品类型 0 正常商品 1咖啡劵 2耗材类 3教室类 /// 教育商品类型 0 正常商品 1咖啡劵 2耗材类 3教室类
...@@ -683,5 +683,10 @@ namespace Mall.Model.Entity.Product ...@@ -683,5 +683,10 @@ namespace Mall.Model.Entity.Product
///进阶小课堂 是否显示商品(1-显示，0-不显示) ///进阶小课堂 是否显示商品(1-显示，0-不显示)
/// </summary> /// </summary>
public int IsShow { get; set; } public int IsShow { get; set; }
/// <summary>
/// 定金比例 2024-02-21 add by:W
/// </summary>
public decimal DepositRatio { get; set; }
} }
} }
Mall.Model/Entity/Product/RB_Goods_Order.cs
View file @ 47744e02
...@@ -80,6 +80,16 @@ namespace Mall.Model.Entity.Product ...@@ -80,6 +80,16 @@ namespace Mall.Model.Entity.Product
get; get;
set; set;
} }
/// <summary>
/// 订单实际实收金额
/// </summary>
public decimal? PayIncome
{
get;
set;
}
/// <summary> /// <summary>
/// 运费 /// 运费
/// </summary> /// </summary>
...@@ -376,5 +386,7 @@ namespace Mall.Model.Entity.Product ...@@ -376,5 +386,7 @@ namespace Mall.Model.Entity.Product
/// 进阶思维rb_student表中StuId学生编号 /// 进阶思维rb_student表中StuId学生编号
/// </summary> /// </summary>
public int JJSWStuId { get; set; } public int JJSWStuId { get; set; }
} }
} }
Mall.Model/Entity/Product/RB_Goods_OrderDetail.cs
View file @ 47744e02
...@@ -384,6 +384,8 @@ namespace Mall.Model.Entity.Product ...@@ -384,6 +384,8 @@ namespace Mall.Model.Entity.Product
/// </summary> /// </summary>
public decimal DepositMoney { get; set; } public decimal DepositMoney { get; set; }
/// <summary> /// <summary>
/// 储值卡抵扣运费金额 /// 储值卡抵扣运费金额
/// </summary> /// </summary>
...@@ -424,5 +426,10 @@ namespace Mall.Model.Entity.Product ...@@ -424,5 +426,10 @@ namespace Mall.Model.Entity.Product
/// 和平商旅下单自定义表单内容 /// 和平商旅下单自定义表单内容
/// </summary> /// </summary>
public string CustomFormInfo { get; set; } public string CustomFormInfo { get; set; }
/// <summary>
/// 定金比例 2024-02-21 add by:W
/// </summary>
public decimal DepositRatio { get; set; }
} }
} }
Mall.Model/Extend/Product/RB_Goods_Order_Extend.cs
View file @ 47744e02
...@@ -334,7 +334,16 @@ namespace Mall.Model.Extend.Product ...@@ -334,7 +334,16 @@ namespace Mall.Model.Extend.Product
/// 客户自定义表单填写内容 2024-01-30 add by:W /// 客户自定义表单填写内容 2024-01-30 add by:W
/// </summary> /// </summary>
public string CustomFormInfo { get; set; } public string CustomFormInfo { get; set; }
//public List<TradePavilion.FormDataItem> CustomFormInfo { get; set; }
/// <summary>
/// 定金金额 2024-02-22 add by:W
/// </summary>
public decimal GoodsDepositMoney { get; set; }
/// <summary>
/// 最终支付金额
/// </summary>
public decimal ResultPayMoney { get; set; }
} }
/// <summary> /// <summary>
......
Mall.Module.Product/OrderModule.cs
View file @ 47744e02
This diff is collapsed.
Mall.Module.Product/OrderModule_Part.cs
View file @ 47744e02
...@@ -3363,7 +3363,15 @@ namespace Mall.Module.Product ...@@ -3363,7 +3363,15 @@ namespace Mall.Module.Product
Dictionary<string, object> keyValues = new Dictionary<string, object>() { }; Dictionary<string, object> keyValues = new Dictionary<string, object>() { };
if (type == 1) if (type == 1)
{ //通过 { //通过
if (model.TenantId == 29)
{
keyValues.Add(nameof(RB_Goods_OrderAfterSale.ReOrderStatus), OrderAfterSaleStatusEnum.RefundedBySeller);
}
else
{
keyValues.Add(nameof(RB_Goods_OrderAfterSale.ReOrderStatus), OrderAfterSaleStatusEnum.DeliveryToBuyer); keyValues.Add(nameof(RB_Goods_OrderAfterSale.ReOrderStatus), OrderAfterSaleStatusEnum.DeliveryToBuyer);
}
keyValues.Add(nameof(RB_Goods_OrderAfterSale.DeliveryId), DeliveryId); keyValues.Add(nameof(RB_Goods_OrderAfterSale.DeliveryId), DeliveryId);
keyValues.Add(nameof(RB_Goods_OrderAfterSale.AuditTime), DateTime.Now); keyValues.Add(nameof(RB_Goods_OrderAfterSale.AuditTime), DateTime.Now);
} }
...@@ -3837,7 +3845,7 @@ namespace Mall.Module.Product ...@@ -3837,7 +3845,7 @@ namespace Mall.Module.Product
CreateDate = DateTime.Now, CreateDate = DateTime.Now,
IsRefund = 2, IsRefund = 2,
MallBaseId = omodel.MallBaseId, MallBaseId = omodel.MallBaseId,
Money = omodel.Income, Money = omodel?.TenantId == 29 ? omodel.PayIncome : omodel.Income,
OrderId = omodel.OrderId, OrderId = omodel.OrderId,
Out_Trade_No = outTradeNo, Out_Trade_No = outTradeNo,
PayType = "", PayType = "",
...@@ -4585,10 +4593,18 @@ namespace Mall.Module.Product ...@@ -4585,10 +4593,18 @@ namespace Mall.Module.Product
keyValues.Add(nameof(RB_Goods_Order.CancelTime), DateTime.Now); keyValues.Add(nameof(RB_Goods_Order.CancelTime), DateTime.Now);
keyValues.Add(nameof(RB_Goods_Order.RefundOrderNo), RefundOrderNo); keyValues.Add(nameof(RB_Goods_Order.RefundOrderNo), RefundOrderNo);
if (omodel.OrderStatus != OrderStatusEnum.NonPayment) if (omodel.OrderStatus != OrderStatusEnum.NonPayment)
{
if (omodel.TenantId == 29)
{
keyValues.Add(nameof(RB_Goods_Order.Refund), omodel.PayIncome);
}
else
{ {
keyValues.Add(nameof(RB_Goods_Order.Refund), omodel.Income); keyValues.Add(nameof(RB_Goods_Order.Refund), omodel.Income);
} }
}
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){ new WhereHelper(){
FiledName=nameof(RB_Goods_Order.OrderId), FiledName=nameof(RB_Goods_Order.OrderId),
...@@ -7002,6 +7018,7 @@ namespace Mall.Module.Product ...@@ -7002,6 +7018,7 @@ namespace Mall.Module.Product
FinishTime = model.FinishTime.HasValue ? model.FinishTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "", FinishTime = model.FinishTime.HasValue ? model.FinishTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
CancelTime = model.CancelTime.HasValue ? model.CancelTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "", CancelTime = model.CancelTime.HasValue ? model.CancelTime.Value.ToString("yyyy-MM-dd HH:mm:ss") : "",
model.Remark, model.Remark,
CancelRemark = model.CancelRemark ?? "",
model.BuyerMessage, model.BuyerMessage,
model.PreferPrice, model.PreferPrice,
model.Income, model.Income,
...@@ -8561,7 +8578,8 @@ namespace Mall.Module.Product ...@@ -8561,7 +8578,8 @@ namespace Mall.Module.Product
itemLabel.CommentNum += 1; itemLabel.CommentNum += 1;
} }
} }
if (itemLabel.CommentNum > 0) { if (itemLabel.CommentNum > 0)
{
RList.Add(new RList.Add(new
{ {
Id = Convert.ToInt32(itemLabel.Id), Id = Convert.ToInt32(itemLabel.Id),
......
Mall.Module.Product/ProductModule.cs
View file @ 47744e02
...@@ -2635,6 +2635,7 @@ namespace Mall.Module.Product ...@@ -2635,6 +2635,7 @@ namespace Mall.Module.Product
use_attr = model.IsCustomSpecification, use_attr = model.IsCustomSpecification,
remark = model?.Remark ?? "", remark = model?.Remark ?? "",
edu_data = eduDataJson, edu_data = eduDataJson,
depositRatio = model?.DepositRatio ?? 0,
EduTeacherId = model?.EduTeacherId ?? 0, EduTeacherId = model?.EduTeacherId ?? 0,
//attr_groups = model.SpecificationList.Select(x => new //attr_groups = model.SpecificationList.Select(x => new
//{ //{
...@@ -7436,7 +7437,8 @@ namespace Mall.Module.Product ...@@ -7436,7 +7437,8 @@ namespace Mall.Module.Product
{ nameof(RB_Goods.FatCode),demodel.FatCode }, { nameof(RB_Goods.FatCode),demodel.FatCode },
{ nameof(RB_Goods.GoodsUrl),demodel.GoodsUrl }, { nameof(RB_Goods.GoodsUrl),demodel.GoodsUrl },
{ nameof(RB_Goods.goodsLogo),demodel.goodsLogo }, { nameof(RB_Goods.goodsLogo),demodel.goodsLogo },
{ nameof(RB_Goods.RetailStore),demodel.RetailStore } { nameof(RB_Goods.RetailStore),demodel.RetailStore },
{ nameof(RB_Goods.DepositRatio),demodel.DepositRatio }
}; };
if (goodsModel.IsProcurement == 1) if (goodsModel.IsProcurement == 1)
{ {
......
Mall.Module.User/UserCommonModule.cs
View file @ 47744e02
...@@ -24,6 +24,8 @@ using Mall.Repository.Education; ...@@ -24,6 +24,8 @@ using Mall.Repository.Education;
using Mall.ThirdCore.Adapay.Model; using Mall.ThirdCore.Adapay.Model;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using RabbitMQ.Client.Framing.Impl;
using RabbitMQ.Client;
namespace Mall.Module.User namespace Mall.Module.User
{ {
...@@ -387,6 +389,31 @@ namespace Mall.Module.User ...@@ -387,6 +389,31 @@ namespace Mall.Module.User
{ {
return false; return false;
} }
if (oldOrder.MallBaseId == 19)
{
if (oldOrder.OrderStatus != Common.Enum.Goods.OrderStatusEnum.NonPayment && (oldOrder.OrderStatus != Common.Enum.Goods.OrderStatusEnum.WaitReceiving && (oldOrder.Income ?? 0) > (oldOrder.PayIncome ?? 0)))
{
return false;
}
if ((oldOrder.PayIncome ?? 0) == 0)
{
var modelDetailList = goodsOrderDetailRepository.GetOrderDetailList(new RB_Goods_OrderDetail_Extend { OrderId = oldOrder.OrderId, TenantId = oldOrder.TenantId, MallBaseId = oldOrder.MallBaseId });
decimal depositMoney = modelDetailList?.Where(x => x.DepositRatio > 0)?.Sum(x => (1 - (x.DepositRatio / 100)) * (x.Final_Price ?? 0)) ?? 0;
if (((oldOrder.Income ?? 0) - depositMoney) != Money)
{
return false;
}
}
else
{
if (((oldOrder.Income ?? 0) - (oldOrder.PayIncome ?? 0)) != Money)
{
return false;
}
}
}
else
{
if (oldOrder.OrderStatus != Common.Enum.Goods.OrderStatusEnum.NonPayment) if (oldOrder.OrderStatus != Common.Enum.Goods.OrderStatusEnum.NonPayment)
{ {
return false; return false;
...@@ -395,6 +422,8 @@ namespace Mall.Module.User ...@@ -395,6 +422,8 @@ namespace Mall.Module.User
{ {
return false; return false;
} }
}
//获取订单商品 //获取订单商品
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 });
...@@ -428,6 +457,7 @@ namespace Mall.Module.User ...@@ -428,6 +457,7 @@ namespace Mall.Module.User
//更新订单信息 //更新订单信息
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Goods_Order_Extend.MerchantsNo),Out_Trade_No}, { nameof(RB_Goods_Order_Extend.MerchantsNo),Out_Trade_No},
{ nameof(RB_Goods_Order_Extend.PayIncome),((oldOrder.PayIncome??0)+ Money)},
{ nameof(RB_Goods_Order_Extend.PaymentTime),Time_End}, { nameof(RB_Goods_Order_Extend.PaymentTime),Time_End},
{ nameof(RB_Goods_Order_Extend.PaymentWay),Common.Enum.Goods.OrderPaymentTypeEnum.OnlinePayment} { nameof(RB_Goods_Order_Extend.PaymentWay),Common.Enum.Goods.OrderPaymentTypeEnum.OnlinePayment}
}; };
...@@ -436,7 +466,8 @@ namespace Mall.Module.User ...@@ -436,7 +466,8 @@ namespace Mall.Module.User
keyValues.Add(nameof(RB_Goods_Order_Extend.OrderStatus), Common.Enum.Goods.OrderStatusEnum.WaitReceiving); keyValues.Add(nameof(RB_Goods_Order_Extend.OrderStatus), Common.Enum.Goods.OrderStatusEnum.WaitReceiving);
keyValues.Add(nameof(RB_Goods_Order_Extend.DeliveryTime), DateTime.Now); keyValues.Add(nameof(RB_Goods_Order_Extend.DeliveryTime), DateTime.Now);
} }
else { else
{
if (guidebaseModel != null && guidebaseModel.IsConfirm == 2 && oldOrder.OrderClassify == 1) if (guidebaseModel != null && guidebaseModel.IsConfirm == 2 && oldOrder.OrderClassify == 1)
{ {
keyValues.Add(nameof(RB_Goods_Order_Extend.OrderStatus), Common.Enum.Goods.OrderStatusEnum.WaitReceiving); keyValues.Add(nameof(RB_Goods_Order_Extend.OrderStatus), Common.Enum.Goods.OrderStatusEnum.WaitReceiving);
...@@ -663,7 +694,8 @@ namespace Mall.Module.User ...@@ -663,7 +694,8 @@ namespace Mall.Module.User
} }
#region 咖啡劵 #region 咖啡劵
if (oldOrder.OrderEduType == 1 || oldOrder.OrderEduType == 2) { if (oldOrder.OrderEduType == 1 || oldOrder.OrderEduType == 2)
{
try try
{ {
if (oldOrder.OrderEduType == 1) if (oldOrder.OrderEduType == 1)
...@@ -862,7 +894,7 @@ namespace Mall.Module.User ...@@ -862,7 +894,7 @@ namespace Mall.Module.User
string str = HttpHelper.HttpPost(url, Common.Plugin.JsonHelper.Serialize(postData)); string str = HttpHelper.HttpPost(url, Common.Plugin.JsonHelper.Serialize(postData));
Common.Plugin.LogHelper.WriteInfo("InsertOrderPayInfo_更新小课堂订单::" + OrderId + " Result::" + str); Common.Plugin.LogHelper.WriteInfo("InsertOrderPayInfo_更新小课堂订单::" + OrderId + " Result::" + str);
} }
catch(Exception ex) catch (Exception ex)
{ {
Common.Plugin.LogHelper.Write(ex, "InsertOrderPayInfo_更新小课堂订单::" + OrderId); Common.Plugin.LogHelper.Write(ex, "InsertOrderPayInfo_更新小课堂订单::" + OrderId);
} }
...@@ -1040,7 +1072,8 @@ namespace Mall.Module.User ...@@ -1040,7 +1072,8 @@ namespace Mall.Module.User
ECOrderDetailId = x.Id ECOrderDetailId = x.Id
})) }))
}); });
if (applyId > 0) { if (applyId > 0)
{
//插入明细 //插入明细
foreach (var item in orderGoodsList) foreach (var item in orderGoodsList)
{ {
...@@ -1053,7 +1086,7 @@ namespace Mall.Module.User ...@@ -1053,7 +1086,7 @@ namespace Mall.Module.User
CourseName = "", CourseName = "",
CreateBy = financeConfig.CreateBy, CreateBy = financeConfig.CreateBy,
CreateDate = DateTime.Now, CreateDate = DateTime.Now,
Number = item.Number??0, Number = item.Number ?? 0,
RB_Branch_Id = userInfo.School_Id, RB_Branch_Id = userInfo.School_Id,
RB_Group_Id = userInfo.Group_Id, RB_Group_Id = userInfo.Group_Id,
Status = 0, Status = 0,
...@@ -1073,7 +1106,8 @@ namespace Mall.Module.User ...@@ -1073,7 +1106,8 @@ namespace Mall.Module.User
#region 财务单据数据组装 #region 财务单据数据组装
List<object> ECList = new List<object>(); List<object> ECList = new List<object>();
var detailList = new List<object>(); var detailList = new List<object>();
foreach (var item in orderGoodsList) { foreach (var item in orderGoodsList)
{
detailList.Add(new detailList.Add(new
{ {
CostTypeId = financeConfig?.CostTypeId ?? 0, CostTypeId = financeConfig?.CostTypeId ?? 0,
...@@ -1082,7 +1116,8 @@ namespace Mall.Module.User ...@@ -1082,7 +1116,8 @@ namespace Mall.Module.User
UnitPrice = Convert.ToDecimal(item.Final_Price ?? 0), UnitPrice = Convert.ToDecimal(item.Final_Price ?? 0),
Remark = item.GoodsName + " ，数量：" + (item.Number ?? 0) + "，订单号：" + Out_Trade_No Remark = item.GoodsName + " ，数量：" + (item.Number ?? 0) + "，订单号：" + Out_Trade_No
}); });
if (item.FreightMoney > 0) { if (item.FreightMoney > 0)
{
detailList.Add(new detailList.Add(new
{ {
CostTypeId = financeConfig?.School_Id ?? 0,//暂存 运费ID CostTypeId = financeConfig?.School_Id ?? 0,//暂存 运费ID
...@@ -1104,7 +1139,7 @@ namespace Mall.Module.User ...@@ -1104,7 +1139,7 @@ namespace Mall.Module.User
IsPublic = 1, IsPublic = 1,
BType = 1, BType = 1,
AccountId = financeConfig?.ClientID ?? 0, AccountId = financeConfig?.ClientID ?? 0,
WBMoney = Convert.ToDecimal(oldOrder.Income ?? 0) -(orderGoodsList.Sum(x=>x.ServiceCharge)), WBMoney = Convert.ToDecimal(oldOrder.Income ?? 0) - (orderGoodsList.Sum(x => x.ServiceCharge)),
TradeDate = Time_End, TradeDate = Time_End,
AccountNumber = Transaction_Id, AccountNumber = Transaction_Id,
TemplateId = financeConfig?.TempleteId ?? 0, TemplateId = financeConfig?.TempleteId ?? 0,
...@@ -2510,7 +2545,7 @@ namespace Mall.Module.User ...@@ -2510,7 +2545,7 @@ namespace Mall.Module.User
GuestNum = item.Number, GuestNum = item.Number,
Unit_Price = item.Unit_Price, Unit_Price = item.Unit_Price,
PreferPrice = item.Final_Price, PreferPrice = item.Final_Price,
SaleRemark ="学生信息："+ model.Consignee + "," + model.Mobile+ (string.IsNullOrWhiteSpace(model.Remark)?"": "学生备注：" + model.Remark) , SaleRemark = "学生信息：" + model.Consignee + "," + model.Mobile + (string.IsNullOrWhiteSpace(model.Remark) ? "" : "学生备注：" + model.Remark),
IsLessPrice = (item.CouponMoney ?? 0) > 0 ? 1 : 0, IsLessPrice = (item.CouponMoney ?? 0) > 0 ? 1 : 0,
LessPrice = (item.CouponMoney ?? 0), LessPrice = (item.CouponMoney ?? 0),
Income = 0,//item.Final_Price - item.ServiceCharge, Income = 0,//item.Final_Price - item.ServiceCharge,
...@@ -2520,11 +2555,11 @@ namespace Mall.Module.User ...@@ -2520,11 +2555,11 @@ namespace Mall.Module.User
GuestName = model.Consignee + "," + model.Mobile GuestName = model.Consignee + "," + model.Mobile
}); });
} }
if (classList!=null&& classList.Any()) if (classList != null && classList.Any())
{ {
var resultInfo = new var resultInfo = new
{ {
Msg = new { Order = classList, EnterID = model.EduUserId > 0 ? model.EduUserId : Convert.ToInt32(Config.EduXuZongId??"2602") }, Msg = new { Order = classList, EnterID = model.EduUserId > 0 ? model.EduUserId : Convert.ToInt32(Config.EduXuZongId ?? "2602") },
}; };
string apiResult = Common.Plugin.HttpHelper.HttpPost(Config.ReadConfigKey("EduOrderApi"), JsonHelper.Serialize(resultInfo), ""); string apiResult = Common.Plugin.HttpHelper.HttpPost(Config.ReadConfigKey("EduOrderApi"), JsonHelper.Serialize(resultInfo), "");
Newtonsoft.Json.Linq.JObject parmsJob = Newtonsoft.Json.Linq.JObject.Parse(apiResult); Newtonsoft.Json.Linq.JObject parmsJob = Newtonsoft.Json.Linq.JObject.Parse(apiResult);
...@@ -2545,7 +2580,8 @@ namespace Mall.Module.User ...@@ -2545,7 +2580,8 @@ namespace Mall.Module.User
/// <param name="orderId"></param> /// <param name="orderId"></param>
/// <param name="mallBaseId"></param> /// <param name="mallBaseId"></param>
/// <returns></returns> /// <returns></returns>
public RB_Goods_Order_Extend GetAdapayOrderInfo(int orderId, int mallBaseId) { public RB_Goods_Order_Extend GetAdapayOrderInfo(int orderId, int mallBaseId)
{
var orderModel = goods_OrderRepository.GetEntity<RB_Goods_Order_Extend>(orderId); var orderModel = goods_OrderRepository.GetEntity<RB_Goods_Order_Extend>(orderId);
if (orderModel != null) if (orderModel != null)
{ {
...@@ -2638,7 +2674,8 @@ namespace Mall.Module.User ...@@ -2638,7 +2674,8 @@ namespace Mall.Module.User
App_Id = payModel.app_id, App_Id = payModel.app_id,
Fee_Amt = payModel.fee_amt Fee_Amt = payModel.fee_amt
}) > 0; }) > 0;
if (flag) { if (flag)
{
//更新订单信息 //更新订单信息
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Goods_Order_Extend.MerchantsNo),payModel.out_trans_id}, { nameof(RB_Goods_Order_Extend.MerchantsNo),payModel.out_trans_id},
...@@ -2691,7 +2728,7 @@ namespace Mall.Module.User ...@@ -2691,7 +2728,7 @@ namespace Mall.Module.User
string str = HttpHelper.HttpPost(url, Common.Plugin.JsonHelper.Serialize(postData)); string str = HttpHelper.HttpPost(url, Common.Plugin.JsonHelper.Serialize(postData));
Common.Plugin.LogHelper.WriteInfo("InsertAdapayOrderTrade_更新小课堂订单::" + OrderId + " Result::" + str); Common.Plugin.LogHelper.WriteInfo("InsertAdapayOrderTrade_更新小课堂订单::" + OrderId + " Result::" + str);
} }
catch(Exception ex) catch (Exception ex)
{ {
Common.Plugin.LogHelper.Write(ex, "InsertAdapayOrderTrade_更新小课堂订单::" + OrderId); Common.Plugin.LogHelper.Write(ex, "InsertAdapayOrderTrade_更新小课堂订单::" + OrderId);
} }
......
Mall.Repository/Product/RB_Goods_Online_TradeRepository.cs
View file @ 47744e02
...@@ -38,7 +38,10 @@ namespace Mall.Repository.Product ...@@ -38,7 +38,10 @@ namespace Mall.Repository.Product
{ {
where += $@" and {nameof(RB_Goods_Online_Trade.User_Id)}={dmodel.User_Id}"; where += $@" and {nameof(RB_Goods_Online_Trade.User_Id)}={dmodel.User_Id}";
} }
if (dmodel.OrderId > 0)
{
where += $@" and {nameof(RB_Goods_Online_Trade.OrderId)}={dmodel.OrderId}";
}
string sql = $@"SELECT * FROM RB_Goods_Online_Trade where {where} order by Id asc"; string sql = $@"SELECT * FROM RB_Goods_Online_Trade where {where} order by Id asc";
return Get<RB_Goods_Online_Trade_Extend>(sql).ToList(); return Get<RB_Goods_Online_Trade_Extend>(sql).ToList();
} }
......
Mall.Repository/Product/RB_Goods_OrderRepository.cs
View file @ 47744e02
...@@ -63,9 +63,16 @@ namespace Mall.Repository.Product ...@@ -63,9 +63,16 @@ namespace Mall.Repository.Product
where += $@" and o.{nameof(RB_Goods_Order.CreateDate)} <='{dmodel.EndTime} 23:59:59'"; where += $@" and o.{nameof(RB_Goods_Order.CreateDate)} <='{dmodel.EndTime} 23:59:59'";
} }
if (dmodel.OrderStatus > 0) if (dmodel.OrderStatus > 0)
{
if ((int)dmodel.OrderStatus != 8)
{ {
where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)}={(int)dmodel.OrderStatus}"; where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)}={(int)dmodel.OrderStatus}";
} }
else
{
where += $@" and o.{nameof(RB_Goods_Order.OrderStatus)}={(int)OrderStatusEnum.WaitReceiving} and o.Income>o.PayIncome and o.PayIncome>0";
}
}
if (dmodel.IsOffline > -1) if (dmodel.IsOffline > -1)
{ {
where += $@" and o.{nameof(RB_Goods_Order.IsOffline)}={(int)dmodel.IsOffline}"; where += $@" and o.{nameof(RB_Goods_Order.IsOffline)}={(int)dmodel.IsOffline}";
...@@ -84,7 +91,7 @@ namespace Mall.Repository.Product ...@@ -84,7 +91,7 @@ namespace Mall.Repository.Product
if (!string.IsNullOrEmpty(dmodel.OrderNo)) if (!string.IsNullOrEmpty(dmodel.OrderNo))
{ {
where += $@" and o.{nameof(RB_Goods_Order.OrderNo)} like @OrderNo "; where += $@" and o.{nameof(RB_Goods_Order.OrderNo)} like @OrderNo ";
parameters.Add("OrderNo", "%" + Common.Plugin.StringHelper.ReplaceEmoji(dmodel.OrderNo.Trim())+ "%"); parameters.Add("OrderNo", "%" + Common.Plugin.StringHelper.ReplaceEmoji(dmodel.OrderNo.Trim()) + "%");
} }
if (!string.IsNullOrEmpty(dmodel.MerchantsNo)) if (!string.IsNullOrEmpty(dmodel.MerchantsNo))
{ {
...@@ -149,7 +156,8 @@ namespace Mall.Repository.Product ...@@ -149,7 +156,8 @@ namespace Mall.Repository.Product
//查询教育商品 //查询教育商品
where += $@" and o.{nameof(RB_Goods_Order.OrderEduType)}>0"; where += $@" and o.{nameof(RB_Goods_Order.OrderEduType)}>0";
} }
else { else
{
//默认查询 //默认查询
where += $@" and o.{nameof(RB_Goods_Order.OrderEduType)} =0"; where += $@" and o.{nameof(RB_Goods_Order.OrderEduType)} =0";
} }
......
Mall.WebApi/Controllers/AppletWeChat/WeChatPayController.cs
View file @ 47744e02
...@@ -23,6 +23,7 @@ using Microsoft.AspNetCore.Http; ...@@ -23,6 +23,7 @@ using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using RabbitMQ.Client.Framing.Impl;
namespace Mall.WebApi.Controllers.AppletWeChat namespace Mall.WebApi.Controllers.AppletWeChat
{ {
...@@ -87,11 +88,21 @@ namespace Mall.WebApi.Controllers.AppletWeChat ...@@ -87,11 +88,21 @@ namespace Mall.WebApi.Controllers.AppletWeChat
{ {
return ApiResult.Failed("订单已取消"); return ApiResult.Failed("订单已取消");
} }
if (model.MallBaseId == 19)//支付定金金额
{
if ((model?.Income ?? 0) <= (model?.PayIncome ?? 0))
{
return ApiResult.Failed("订单已支付");
}
}
else
{
if ((int)model.OrderStatus > 1) if ((int)model.OrderStatus > 1)
{ {
return ApiResult.Failed("订单已支付"); return ApiResult.Failed("订单已支付");
} }
}
string sOrderNo = (System.DateTime.Now.ToString("yyyyMMddHHmmssfff")) + model.OrderId; string sOrderNo = (System.DateTime.Now.ToString("yyyyMMddHHmmssfff")) + model.OrderId;
//根据订单号获取微信支付配置信息 //根据订单号获取微信支付配置信息
RB_MiniProgram_Extend miniProgram = new RB_MiniProgram_Extend(); //2020年5月26号新增 RB_MiniProgram_Extend miniProgram = new RB_MiniProgram_Extend(); //2020年5月26号新增
...@@ -100,8 +111,15 @@ namespace Mall.WebApi.Controllers.AppletWeChat ...@@ -100,8 +111,15 @@ namespace Mall.WebApi.Controllers.AppletWeChat
switch ((int)demodel.OrderPayType) switch ((int)demodel.OrderPayType)
{ {
case 1://微信支付 _accessor.HttpContext.Connection.RemoteIpAddress.ToString() case 1://微信支付 _accessor.HttpContext.Connection.RemoteIpAddress.ToString()
//(model.MallBaseId==6&&model.TenantId==16)? "https://mallapi.oytour.com/api/WeChatNotify/NotifyZhouTian" :
sPayInfo = App_Code.PayUtil.GetMinUnifiedOrder(sOrderNo, demodel.GoodsName, model.Income.Value, model.UserId.ToString(), demodel.OpenId, (Config.sTenpayNotify + "/" + model.MallBaseId + "/" + model.TenantId), miniProgram, _accessor, System.Net.Dns.GetHostEntry(System.Net.Dns.GetHostName()).AddressList.FirstOrDefault(address => address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)?.ToString()); decimal payIncome = (model.Income.Value) - (model?.PayIncome ?? 0);//实际应付金额-已支付金额
if (model.TenantId == 29 && (model?.PayIncome ?? 0) == 0)//支付定金金额
{
var modelDetailList = new Module.Product.OrderModule().GetOrderDetailList(new RB_Goods_OrderDetail_Extend { OrderId = model.OrderId, TenantId = model.TenantId, MallBaseId = model.MallBaseId });
decimal depositMoney = modelDetailList.Where(x => x.DepositRatio > 0).Sum(x => (1 - (x.DepositRatio / 100)) * (x.Final_Price ?? 0));
payIncome = payIncome - depositMoney;//最终应付金额-定金-退款
}
sPayInfo = App_Code.PayUtil.GetMinUnifiedOrder(sOrderNo, demodel.GoodsName, payIncome, model.UserId.ToString(), demodel.OpenId, (Config.sTenpayNotify + "/" + model.MallBaseId + "/" + model.TenantId), miniProgram, _accessor, System.Net.Dns.GetHostEntry(System.Net.Dns.GetHostName()).AddressList.FirstOrDefault(address => address.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)?.ToString());
break; break;
default: default:
break; break;
...@@ -575,12 +593,15 @@ namespace Mall.WebApi.Controllers.AppletWeChat ...@@ -575,12 +593,15 @@ namespace Mall.WebApi.Controllers.AppletWeChat
var Robj = userCommonModule.InsertVipBuyCommission(userId, orderId, orderNo, 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);
} }
/// <summary>
/// 测试接口调用支付成功
/// </summary>
/// <returns></returns>
public ApiResult InsertOrderPayInfo() public ApiResult InsertOrderPayInfo()
{ {
var request = RequestParm; var request = RequestParm;
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, (System.DateTime.Now.ToString("yyyyMMddHHmmssfff")) + demodel.OrderId, demodel.MerchantsNo, Common.Enum.Goods.OrderPayTypeEnum.WeChatPay, demodel.StoreName, (demodel.Income ?? 0), System.DateTime.Now, 0);
return ApiResult.Success(""); return ApiResult.Success("");
} }
......
Mall.WebApi/Controllers/Product/AppletOrderController.cs
View file @ 47744e02
...@@ -246,6 +246,9 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -246,6 +246,9 @@ namespace Mall.WebApi.Controllers.MallBase
x.DeliveryMethod, x.DeliveryMethod,
DeliveryMethodName = x.DeliveryMethod.GetEnumName(), DeliveryMethodName = x.DeliveryMethod.GetEnumName(),
x.Income, x.Income,
x.ResultPayMoney,
x.GoodsDepositMoney,
PayIncome = x.PayIncome ?? 0,
x.FreightMoney, x.FreightMoney,
x.CouponMoney, x.CouponMoney,
x.DepositId, x.DepositId,
...@@ -586,6 +589,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -586,6 +589,7 @@ namespace Mall.WebApi.Controllers.MallBase
demodel.UserId = userInfo.UserId; demodel.UserId = userInfo.UserId;
demodel.SmallShopsId = req.SmallShopsId; demodel.SmallShopsId = req.SmallShopsId;
demodel.OrderClassify = 0; demodel.OrderClassify = 0;
demodel.PayIncome = 0;
if (userInfo != null) if (userInfo != null)
{ {
if (userInfo.UserId.ToString() == Config.XuZongUserId) if (userInfo.UserId.ToString() == Config.XuZongUserId)
...@@ -1161,6 +1165,12 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1161,6 +1165,12 @@ namespace Mall.WebApi.Controllers.MallBase
} }
} }
if (omodel.TenantId == 29)
{
bool flag = orderModule.CancelAppletGoodsOrderInfo(omodel.OrderId, 2, demodel.Remark, userInfo.UserId, userInfo.TenantId, userInfo.MallBaseId);
if (flag) { return ApiResult.Success(); } else { return ApiResult.Failed(); }
}
else {
demodel.TenantId = userInfo.TenantId; demodel.TenantId = userInfo.TenantId;
demodel.MallBaseId = userInfo.MallBaseId; demodel.MallBaseId = userInfo.MallBaseId;
demodel.UserId = userInfo.UserId; demodel.UserId = userInfo.UserId;
...@@ -1174,6 +1184,9 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1174,6 +1184,9 @@ namespace Mall.WebApi.Controllers.MallBase
if (flag) { return ApiResult.Success(); } else { return ApiResult.Failed(); } if (flag) { return ApiResult.Success(); } else { return ApiResult.Failed(); }
} }
}
/// <summary> /// <summary>
/// 获取买家发货页面详情 /// 获取买家发货页面详情
/// </summary> /// </summary>
......
Mall.WebApi/Controllers/Product/ProductController.cs
View file @ 47744e02
...@@ -1824,7 +1824,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1824,7 +1824,8 @@ namespace Mall.WebApi.Controllers.MallBase
model?.goodsLogo, model?.goodsLogo,
model?.GoodsEduType, model?.GoodsEduType,
model?.MaterialId, model?.MaterialId,
RelevanceList = model?.RelevanceList.Select(qitem => new { qitem.RelevanceId, qitem.RelevanceName, qitem.RelevancePrice, qitem.Unit }) RelevanceList = model?.RelevanceList.Select(qitem => new { qitem.RelevanceId, qitem.RelevanceName, qitem.RelevancePrice, qitem.Unit }),
DepositRatio = model?.DepositRatio ?? 0,
}; };
} }
return ApiResult.Success("", obj); return ApiResult.Success("", obj);
...@@ -1900,7 +1901,8 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -1900,7 +1901,8 @@ namespace Mall.WebApi.Controllers.MallBase
RetailStore = parms.GetInt("RetailStore"), RetailStore = parms.GetInt("RetailStore"),
CreateBy = parms.GetInt("EmpId", 0), CreateBy = parms.GetInt("EmpId", 0),
GoodsEduType = parms.GetInt("GoodsEduType", 0), GoodsEduType = parms.GetInt("GoodsEduType", 0),
MaterialId = parms.GetInt("MaterialId", 0) MaterialId = parms.GetInt("MaterialId", 0),
DepositRatio = parms.GetInt("DepositRatio", 0)
}; };
if (!string.IsNullOrEmpty(parms.GetStringValue("ShelvesDate"))) if (!string.IsNullOrEmpty(parms.GetStringValue("ShelvesDate")))
{ {
......
Mall.WebApi/appsettings.json
View file @ 47744e02
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
} }
}, },
"AliSms": { "AliSms": {
"signName": "印象之旅", "signName": "ӡ��֮��",
"accessKeyId": "LTAIwE7l9dImZSa3", "accessKeyId": "LTAIwE7l9dImZSa3",
"accessKeySecret": "j47Ajn0d0WzUCIX8Biyj3P2r8QDltI" "accessKeySecret": "j47Ajn0d0WzUCIX8Biyj3P2r8QDltI"
}, },
...@@ -42,20 +42,20 @@ ...@@ -42,20 +42,20 @@
"DeveloperKitsPort": "15720", "DeveloperKitsPort": "15720",
"FirstPage": "pages/index/index.html", "FirstPage": "pages/index/index.html",
"ByteDanceSendTemplate": "https://developer.toutiao.com/api/apps/game/template/send", "ByteDanceSendTemplate": "https://developer.toutiao.com/api/apps/game/template/send",
"sTenpayNotify": "http://mallapi.oytour.com/api/WeChatNotify/Notify", //微信商品回调地址 "sTenpayNotify": "http://mallapi.oytour.com/api/WeChatNotify/Notify", //΢����Ʒ�ص���ַ
"sTenpayRechargeNotify": "http://mallapi.oytour.com/api/WeChatNotify/RechargeNotify", //微信充值回调地址 "sTenpayRechargeNotify": "http://mallapi.oytour.com/api/WeChatNotify/RechargeNotify", //΢�ų�ֵ�ص���ַ
"sTenpayMemberBuyNotify": "http://mallapi.oytour.com/api/WeChatNotify/MemberBuyNotify", //微信充值回调地址 "sTenpayMemberBuyNotify": "http://mallapi.oytour.com/api/WeChatNotify/MemberBuyNotify", //΢�ų�ֵ�ص���ַ
"sTenpayVipBuyNotify": "http://mallapi.oytour.com/api/WeChatNotify/VipBuyNotify", //微信购买VIP回调地址 "sTenpayVipBuyNotify": "http://mallapi.oytour.com/api/WeChatNotify/VipBuyNotify", //΢�Ź���VIP�ص���ַ
"sTenpayActivityNotify": "http://mallapi.oytour.com/api/WeChatNotify/ActivityNotify", //赞羊教育活动在线支付回调地址 "sTenpayActivityNotify": "http://mallapi.oytour.com/api/WeChatNotify/ActivityNotify", //������������֧���ص���ַ
"NetworkDirector": 1756, //网络主管的id，用于新建供应商账户的时候的创建人 "NetworkDirector": 1756, //�������ܵ�id�������½���Ӧ���˻���ʱ��Ĵ�����
"RB_Branch_Id": 49, //所属公司id "RB_Branch_Id": 49, //�����˾id
"IncomeDirector": 1756, //财务收入创建人 "IncomeDirector": 1756, //�������봴����
"IncomeBranchId": 49, //财务收入创建人公司 "IncomeBranchId": 49, //�������봴���˹�˾
"IncomeDepartment": 331, "IncomeDepartment": 331,
"ExpendDirector": 1756, //财务支出创建人 "ExpendDirector": 1756, //����֧��������
"ExpendBranchId": 49, //财务支出创建人公司 "ExpendBranchId": 49, //����֧�������˹�˾
"ExpendDepartment": 331, "ExpendDepartment": 331,
"XuZongUserId": 111790, //徐总的id，用于区分线下订单 "XuZongUserId": 111790, //���ܵ�id�������������¶���
"RebornDMC": "reborn_dmc", "RebornDMC": "reborn_dmc",
"PropertyDB": "test_property", "PropertyDB": "test_property",
"IncomeFinanceApi": "http://192.168.10.2:8083/api/Mall/InsertFinanceBatchForMallIn", "IncomeFinanceApi": "http://192.168.10.2:8083/api/Mall/InsertFinanceBatchForMallIn",
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
"FinanceKey": "FinanceMallInsertToERPViitto2020", "FinanceKey": "FinanceMallInsertToERPViitto2020",
"SettlementRate": "0.60", "SettlementRate": "0.60",
"EduSettlementRate": "0.54", "EduSettlementRate": "0.54",
"EduXuZongId": 2602, //徐总的id，用于区分线下订单 "EduXuZongId": 2602, //���ܵ�id�������������¶���
"EduActivityIncomeFinanceId": "9", "EduActivityIncomeFinanceId": "9",
"EduActivityExpendFinanceId": "9", "EduActivityExpendFinanceId": "9",
"EduRollCallActionCode": "ActivityRollCall", "EduRollCallActionCode": "ActivityRollCall",
...@@ -80,13 +80,13 @@ ...@@ -80,13 +80,13 @@
"VirtualDirectory": "WebFile", "VirtualDirectory": "WebFile",
"FileService": "2", "FileService": "2",
"IsNormalServer": 2, "IsNormalServer": 2,
"IsFirtsShopAutoExamine": 1, //首店企业认证是否字段审核 "IsFirtsShopAutoExamine": 1, //�׵���ҵ��֤�Ƿ��ֶ����
"FinanceSetting": { "FinanceSetting": {
"TenantId": 1, "TenantId": 1,
"MallBaseId": 1, "MallBaseId": 1,
"RemitTypeId": 10, "RemitTypeId": 10,
"RemitAccountId": 3012, "RemitAccountId": 3012,
"ProcurementCTId": 224, //以下采购 "ProcurementCTId": 224, //���²ɹ�
"ProcurementFWId": 127, "ProcurementFWId": 127,
"ProcurementDirector": 1756, "ProcurementDirector": 1756,
"ProcurementBranchId": 49, "ProcurementBranchId": 49,
...@@ -102,6 +102,9 @@ ...@@ -102,6 +102,9 @@
"ShareConfig": { "ShareConfig": {
"ShareImg": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/zanyang.png" "ShareImg": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/zanyang.png"
}, },
//汇付天下回调进阶思维接口地址 "HPSLShareConfig": {
"ShareImg": "https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1708660644000_869.jpg"
},
//�㸶���»ص�����˼ά�ӿڵ�ַ
"JJSWAdminApi": "http://192.168.10.128:5005" "JJSWAdminApi": "http://192.168.10.128:5005"
} }
\ No newline at end of file
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