Skip to content

M
mall.oytour.com
Commit f20b4010 authored by liudong1993's avatar liudong1993
Browse files
Options

司导二次确认

parent a341c25b
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 38 deletions
Mall.Module.Product/OrderModule.cs
View file @ f20b4010
......@@ -5887,11 +5887,6 @@ namespace Mall.Module.Product
/// <param name="OrderId"></param>
private void InsertOrderDetail(RB_Goods_Order_Extend demodel, System.Data.IDbTransaction trans, int OrderId, List<FreeShippingGoodsDetail> SatisfiedGoodsList, bool IsSDGoods = false)
{
Model.Extend.GuideCar.RB_GuideCar_Base_Extend guidebaseModel = new Model.Extend.GuideCar.RB_GuideCar_Base_Extend();
if (IsSDGoods)
{
guidebaseModel = guideCar_BaseRepository.GetList(new Model.Extend.GuideCar.RB_GuideCar_Base_Extend() { TenantId = demodel.TenantId, MallBaseId = demodel.MallBaseId }).FirstOrDefault();
}
foreach (var item in demodel.DetailList)
{
int IntegralPresent = item.IntegralPresent ?? 0;
......@@ -6131,36 +6126,6 @@ namespace Mall.Module.Product
}
}
}
//发送短信通知导游接单
int IsNormalServer = Convert.ToInt32(Config.IsNormalServer);//为正式才发送短信
if (IsNormalServer == 1 && (guidebaseModel?.IsConfirm ?? 0) == 2)
{
if (item.GuideId > 0)
{
//查询导游信息
var guideModel = guideCar_GuideRepository.GetEntity(item.GuideId ?? 0);
var carModel = guideCar_CarRepository.GetEntity(item.CarId ?? 0);
if (guideModel != null && carModel != null && !string.IsNullOrEmpty(guideModel.Telephone))
{
string Telephone = guideModel.Telephone;
MobileCodeTypeEnum mobileCodeType = MobileCodeTypeEnum.GuideMsg;//导游通知
if (ValidateHepler.IsMobileNumber(Telephone))
{
object PhoneMessage = new
{
demodel.OrderNo,
Name = demodel.Consignee,
demodel.Mobile,
TripDate = item.TripSTime.Value.ToString("yyyy-MM-dd HH:mm") + " " + ((item.UseDay ?? 0) == Convert.ToDecimal(0.5) ? "半" : Convert.ToInt32(item.UseDay ?? 0).ToString()) + "日",
Address = demodel.ShoppingAddress,
item.Number
};
SMSService.SendMsg(Telephone, PhoneMessage, EnumHelper.GetEnumName(mobileCodeType));
}
}
}
}
}
#endregion
}
......
Mall.Module.User/Mall.Module.User.csproj
View file @ f20b4010
......@@ -8,6 +8,7 @@
<ProjectReference Include="..\Mall.CacheManager\Mall.CacheManager.csproj" />
<ProjectReference Include="..\Mall.Model\Mall.Model.csproj" />
<ProjectReference Include="..\Mall.Repository\Mall.Repository.csproj" />
<ProjectReference Include="..\Mall.ThirdCore\Mall.ThirdCore.csproj" />
</ItemGroup>
</Project>
Mall.Module.User/UserCommonModule.cs
View file @ f20b4010
......@@ -14,6 +14,9 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Configuration.Json;
using Mall.Model.Entity.MarketingCenter;
using VT.FW.DB;
using Mall.Repository.GuideCar;
using Mall.Common.Enum;
using Mall.ThirdCore.Message;
namespace Mall.Module.User
{
......@@ -75,7 +78,18 @@ namespace Mall.Module.User
/// 粉象返佣等级
/// </summary>
private readonly RB_Distributor_FXGradeRepository distributor_FXGradeRepository = new RB_Distributor_FXGradeRepository();
/// <summary>
/// 司导-基础
/// </summary>
private readonly RB_GuideCar_BaseRepository guideCar_BaseRepository = new RB_GuideCar_BaseRepository();
/// <summary>
/// 司导-导游
/// </summary>
private readonly RB_GuideCar_GuideRepository guideCar_GuideRepository = new RB_GuideCar_GuideRepository();
/// <summary>
/// 司导-车辆
/// </summary>
private readonly RB_GuideCar_CarRepository guideCar_CarRepository = new RB_GuideCar_CarRepository();
private readonly MiniProgramMsgModule appletWeChatModule = new MiniProgramMsgModule();
......@@ -323,13 +337,21 @@ namespace Mall.Module.User
}) > 0;
if (flag)
{
var guidebaseModel = guideCar_BaseRepository.GetList(new Model.Extend.GuideCar.RB_GuideCar_Base_Extend() { TenantId = oldOrder.TenantId, MallBaseId = oldOrder.MallBaseId }).FirstOrDefault();
//更新订单信息
Dictionary<string, object> keyValues = new Dictionary<string, object>() {
{ nameof(RB_Goods_Order_Extend.OrderStatus),Common.Enum.Goods.OrderStatusEnum.WaitSendGoods},
{ nameof(RB_Goods_Order_Extend.MerchantsNo),Out_Trade_No},
{ nameof(RB_Goods_Order_Extend.PaymentTime),Time_End},
{ nameof(RB_Goods_Order_Extend.PaymentWay),Common.Enum.Goods.OrderPaymentTypeEnum.OnlinePayment}
};
if (guidebaseModel != null && guidebaseModel.IsConfirm == 2)
{
keyValues.Add(nameof(RB_Goods_Order_Extend.OrderStatus), Common.Enum.Goods.OrderStatusEnum.WaitReceiving);
keyValues.Add(nameof(RB_Goods_Order_Extend.DeliveryTime), DateTime.Now);
}
else {
keyValues.Add(nameof(RB_Goods_Order_Extend.OrderStatus), Common.Enum.Goods.OrderStatusEnum.WaitSendGoods);
}
List<WhereHelper> wheres = new List<WhereHelper>() {
new WhereHelper(){
FiledName=nameof(RB_Goods_Order_Extend.OrderId),
......@@ -474,6 +496,41 @@ namespace Mall.Module.User
}
}
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);
if (guidebaseModel != null && guidebaseModel.IsConfirm == 2) {
//发送短信通知导游接单
int IsNormalServer = Convert.ToInt32(Config.IsNormalServer);//为正式才发送短信
if (IsNormalServer == 1 && (guidebaseModel?.IsConfirm ?? 0) == 2)
{
foreach (var item in orderGoodsList)
{
if (item.GuideId > 0)
{
//查询导游信息
var guideModel = guideCar_GuideRepository.GetEntity(item.GuideId ?? 0);
var carModel = guideCar_CarRepository.GetEntity(item.CarId ?? 0);
if (guideModel != null && carModel != null && !string.IsNullOrEmpty(guideModel.Telephone))
{
string Telephone = guideModel.Telephone;
MobileCodeTypeEnum mobileCodeType = MobileCodeTypeEnum.GuideMsg;//导游通知
if (ValidateHepler.IsMobileNumber(Telephone))
{
object PhoneMessage = new
{
oldOrder.OrderNo,
Name = oldOrder.Consignee,
oldOrder.Mobile,
TripDate = item.TripSTime.Value.ToString("yyyy-MM-dd HH:mm") + " " + ((item.UseDay ?? 0) == Convert.ToDecimal(0.5) ? "半" : Convert.ToInt32(item.UseDay ?? 0).ToString()) + "日",
Address = oldOrder.ShoppingAddress,
item.Number
};
SMSService.SendMsg(Telephone, PhoneMessage, EnumHelper.GetEnumName(mobileCodeType));
}
}
}
}
}
}
}
return flag;
}
......
Mall.Module.User/UserModule.cs
View file @ f20b4010
......@@ -2466,7 +2466,7 @@ namespace Mall.Module.User
Number = 1,
OriginalMoney = ocModel.Commission,
UnitPrice = ocModel.Commission,
Remark = qitem.GoodsName + " " + qitem.Specification + " " + (omodel?.OrderNo??"")
Remark = qitem.GoodsName + " " + qitem.Specification + " " + ((omodel?.OrderClassify ?? 0) == 1 ? "司导" : "") + (omodel?.OrderNo ?? "")
});
}
}
......
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