Commit a1f29131 authored by 黄奎's avatar 黄奎

页面修改

parent 2f45a40b
...@@ -5613,12 +5613,11 @@ namespace Mall.Module.Product ...@@ -5613,12 +5613,11 @@ namespace Mall.Module.Product
{ {
demodel.PaymentWay = OrderPaymentTypeEnum.OnlinePayment;//先默认在线支付 demodel.PaymentWay = OrderPaymentTypeEnum.OnlinePayment;//先默认在线支付
} }
demodel.Remark ??= ""; demodel.Remark ??= "";
demodel.ApplyForCancelStatus ??= 0; demodel.ApplyForCancelStatus ??= 0;
if (demodel.Income == 0) if (demodel.Income == 0)
{ {
demodel.OrderStatus = OrderStatusEnum.Completed; demodel.OrderStatus = OrderStatusEnum.WaitReceiving;
demodel.PaymentTime = DateTime.Now; demodel.PaymentTime = DateTime.Now;
demodel.DeliveryTime = DateTime.Now; demodel.DeliveryTime = DateTime.Now;
demodel.ReceivingTime = DateTime.Now; demodel.ReceivingTime = DateTime.Now;
......
...@@ -3617,10 +3617,29 @@ namespace Mall.Module.Product ...@@ -3617,10 +3617,29 @@ namespace Mall.Module.Product
} }
#endregion #endregion
var minModel =new RB_MiniProgramRepository().GetMiniProgramRepository(new RB_MiniProgram_Extend()
{
MallBaseId = MallBaseId
});
//订阅
List<string> template_message_list = new List<string>();
if (minModel != null)
{
if (!string.IsNullOrWhiteSpace(minModel.OrderSuccessTpl))
{
template_message_list.Add(minModel.OrderSuccessTpl);
}
if (!string.IsNullOrWhiteSpace(minModel.OrderCancelTpl))
{
template_message_list.Add(minModel.OrderCancelTpl);
}
}
return new return new
{ {
goods = new goods = new
{ {
template_message_list,
id = model.Id, id = model.Id,
mall_id = model.MallBaseId, mall_id = model.MallBaseId,
mch_id = model.TenantId,//暂 商户id mch_id = model.TenantId,//暂 商户id
......
...@@ -1302,11 +1302,14 @@ namespace Mall.Module.Product ...@@ -1302,11 +1302,14 @@ namespace Mall.Module.Product
if (list.FirstOrDefault().OrderDetailId > 0) if (list.FirstOrDefault().OrderDetailId > 0)
{ {
//更新订单商品为已评价 //更新订单商品为已评价
Dictionary<string, object> keyValues = new Dictionary<string, object>() { Dictionary<string, object> keyValues = new Dictionary<string, object>()
{
{ nameof(RB_Goods_OrderDetail.IsComment),1} { nameof(RB_Goods_OrderDetail.IsComment),1}
}; };
List<WhereHelper> wheres = new List<WhereHelper>() { List<WhereHelper> wheres = new List<WhereHelper>()
new WhereHelper(){ {
new WhereHelper()
{
FiledName=nameof(RB_Goods_OrderDetail.Id), FiledName=nameof(RB_Goods_OrderDetail.Id),
FiledValue=list.FirstOrDefault().OrderDetailId, FiledValue=list.FirstOrDefault().OrderDetailId,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
...@@ -1330,11 +1333,14 @@ namespace Mall.Module.Product ...@@ -1330,11 +1333,14 @@ namespace Mall.Module.Product
if (carScore > 0)//更新车辆的评分 if (carScore > 0)//更新车辆的评分
{ {
//更新订单商品为已评价 //更新订单商品为已评价
Dictionary<string, object> keyValuesCar = new Dictionary<string, object>() { Dictionary<string, object> keyValuesCar = new Dictionary<string, object>()
{
{ nameof(RB_Goods.CourseScore),Math.Round(carScore,1, MidpointRounding.AwayFromZero)} { nameof(RB_Goods.CourseScore),Math.Round(carScore,1, MidpointRounding.AwayFromZero)}
}; };
List<WhereHelper> wheresCar = new List<WhereHelper>() { List<WhereHelper> wheresCar = new List<WhereHelper>()
new WhereHelper(){ {
new WhereHelper()
{
FiledName=nameof(RB_Goods.Id), FiledName=nameof(RB_Goods.Id),
FiledValue=dmodel.GoodsId, FiledValue=dmodel.GoodsId,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
...@@ -1359,11 +1365,14 @@ namespace Mall.Module.Product ...@@ -1359,11 +1365,14 @@ namespace Mall.Module.Product
if (guidScore > 0)//更新车辆的评分 if (guidScore > 0)//更新车辆的评分
{ {
//更新订单商品为已评价 //更新订单商品为已评价
Dictionary<string, object> keyValuesCar = new Dictionary<string, object>() { Dictionary<string, object> keyValuesCar = new Dictionary<string, object>()
{
{ nameof(RB_Reserve_ServicePersonal.Score),Math.Round(guidScore,1, MidpointRounding.AwayFromZero)} { nameof(RB_Reserve_ServicePersonal.Score),Math.Round(guidScore,1, MidpointRounding.AwayFromZero)}
}; };
List<WhereHelper> wheresCar = new List<WhereHelper>() { List<WhereHelper> wheresCar = new List<WhereHelper>()
new WhereHelper(){ {
new WhereHelper()
{
FiledName=nameof(RB_Reserve_ServicePersonal.ID), FiledName=nameof(RB_Reserve_ServicePersonal.ID),
FiledValue=dmodel.ServicepersonalId, FiledValue=dmodel.ServicepersonalId,
OperatorEnum=OperatorEnum.Equal OperatorEnum=OperatorEnum.Equal
......
...@@ -75,7 +75,6 @@ namespace Mall.WebApi.Controllers ...@@ -75,7 +75,6 @@ namespace Mall.WebApi.Controllers
get { get {
var parm = this.RequestParm; var parm = this.RequestParm;
AppletUserInfo userInfo = UserReidsCache.GetAppletUserLoginInfo(parm.uid); AppletUserInfo userInfo = UserReidsCache.GetAppletUserLoginInfo(parm.uid);
// AppletUserInfo userInfo = UserReidsCache.GetAppletUserLoginInfo("112603");
return userInfo; return userInfo;
} }
} }
......
...@@ -745,7 +745,7 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -745,7 +745,7 @@ namespace Mall.WebApi.Controllers.MallBase
demodel.DestinationAddress ??= ""; demodel.DestinationAddress ??= "";
#endregion #endregion
bool flag= orderModule.SetAppletOfflineGoodsOrderModule(demodel,out string message); bool flag= orderModule.SetAppletOfflineGoodsOrderModule(demodel,out string message);
return flag ? ApiResult.Success(message: message,data: new { demodel.OrderId }) : ApiResult.Failed(message: message); return flag ? ApiResult.Success(message: message,data: new { demodel.OrderId}) : ApiResult.Failed(message: message);
} }
/// <summary> /// <summary>
......
...@@ -850,10 +850,10 @@ namespace Mall.WebApi.Controllers.Reserve ...@@ -850,10 +850,10 @@ namespace Mall.WebApi.Controllers.Reserve
{ {
return ApiResult.ParamIsNull("请传递商品"); return ApiResult.ParamIsNull("请传递商品");
} }
if (list.Where(x => x.ServicePersonalId > 0).Count() == 0) //if (list.Where(x => x.ServicePersonalId > 0).Count() == 0)
{ //{
return ApiResult.ParamIsNull("请传递服务人员信息"); // return ApiResult.ParamIsNull("请传递服务人员信息");
} //}
} }
else else
{ {
......
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