Commit 7cc2f77e authored by 黄奎's avatar 黄奎

页面修改

parent 8084c578
...@@ -698,10 +698,14 @@ namespace Mall.Module.Product ...@@ -698,10 +698,14 @@ namespace Mall.Module.Product
var scModel = scList.FirstOrDefault(); var scModel = scList.FirstOrDefault();
Dictionary<string, object> keyValues = new Dictionary<string, object>() Dictionary<string, object> keyValues = new Dictionary<string, object>()
{ {
{ nameof(RB_Goods_ShoppingCart.Number),scModel.Number + demodel.Number},
{ nameof(RB_Goods_ShoppingCart.UpdateDate),DateTime.Now}, { nameof(RB_Goods_ShoppingCart.UpdateDate),DateTime.Now},
{ nameof(RB_Goods_ShoppingCart.RelationId),demodel.RelationId}, { nameof(RB_Goods_ShoppingCart.RelationId),demodel.RelationId},
}; };
if (demodel.TenantId != 27)
{
keyValues.Add(nameof(RB_Goods_ShoppingCart.Number), scModel.Number + demodel.Number);
}
List<WhereHelper> wheres = new List<WhereHelper>() List<WhereHelper> wheres = new List<WhereHelper>()
{ {
new WhereHelper() new WhereHelper()
......
...@@ -503,18 +503,21 @@ namespace Mall.WebApi.Controllers.MallBase ...@@ -503,18 +503,21 @@ namespace Mall.WebApi.Controllers.MallBase
{ {
return ApiResult.ParamIsNull("请选择学员!"); return ApiResult.ParamIsNull("请选择学员!");
} }
if (demodel.DeliveryMethod != Common.Enum.Goods.OrderDeliveryMethodEnum.VerificationShop) if (userInfo.TenantId != 27)
{ {
if ((demodel.District ?? 0) <= 0) if (demodel.DeliveryMethod != Common.Enum.Goods.OrderDeliveryMethodEnum.VerificationShop)
{
return ApiResult.ParamIsNull("收货地址有误");
}
if (string.IsNullOrEmpty(demodel.ShoppingAddress))
{ {
return ApiResult.ParamIsNull("收货详细地址不能为空"); if ((demodel.District ?? 0) <= 0)
{
return ApiResult.ParamIsNull("收货地址有误");
}
if (string.IsNullOrEmpty(demodel.ShoppingAddress))
{
return ApiResult.ParamIsNull("收货详细地址不能为空");
}
} }
} }
if (demodel.DetailList == null || !demodel.DetailList.Any()) if (demodel.DetailList == null || !demodel.DetailList.Any())
{ {
return ApiResult.ParamIsNull("请传递商品信息"); return ApiResult.ParamIsNull("请传递商品信息");
......
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