Commit 6922109e authored by 黄奎's avatar 黄奎

新增字段

parent a69a004f
......@@ -34,6 +34,11 @@ namespace Mall.Common
/// </summary>
public int IsOpenSchool { get; set; }
/// <summary>
/// 是否是韩国馆版本(1-是)
/// </summary>
public int IsKorea { get; set; }
/// <summary>
/// 账号
/// </summary>
......
......@@ -584,5 +584,20 @@ namespace Mall.Model.Entity.Product
/// 最低利润率
/// </summary>
public decimal MinProfitRate { get; set; }
/// <summary>
/// 商品所属国家
/// </summary>
public string GoodsCountry { get; set; }
/// <summary>
/// 海关代码/关税率
/// </summary>
public string FatCode { get; set; }
/// <summary>
/// 官网
/// </summary>
public string GoodsUrl { get; set; }
}
}
......@@ -7045,6 +7045,9 @@ namespace Mall.Module.Product
{ nameof(RB_Goods.GoodsPageType),demodel.GoodsPageType },
{ nameof(RB_Goods.IsNoTax),demodel.IsNoTax },
{ nameof(RB_Goods.MinProfitRate),demodel.MinProfitRate },
{ nameof(RB_Goods.GoodsCountry),demodel.GoodsCountry },
{ nameof(RB_Goods.FatCode),demodel.FatCode },
{ nameof(RB_Goods.GoodsUrl),demodel.GoodsUrl },
};
if (goodsModel.IsProcurement == 1)
{
......
......@@ -361,6 +361,7 @@ namespace Mall.WebApi.Controllers.MallBase
id = model.Id,
sign = "",
name = model.Name,
subName= model.SubName,
cover_pic = model.CoverImage,
video_url = model.VideoAddress,
original_price = model.OriginalPrice,
......
......@@ -1792,6 +1792,9 @@ namespace Mall.WebApi.Controllers.MallBase
public ApiResult SetProductGoodsInfo()
{
var parms = RequestParm;
JObject prams = JObject.Parse(parms.msg.ToString());
int IsKorea = prams.GetInt("IsKorea", 0);//是否为韩国馆项目(1-是)
RB_Goods_Extend demodel = JsonConvert.DeserializeObject<RB_Goods_Extend>(parms.msg.ToString());
demodel.TenantId = parms.TenantId;
demodel.MallBaseId = parms.MallBaseId;
......@@ -1805,15 +1808,15 @@ namespace Mall.WebApi.Controllers.MallBase
return ApiResult.ParamIsNull("请添加商品轮播图");
}
demodel.CarouselImage = JsonConvert.SerializeObject(demodel.CarouselImageList.Select(x => x.Path));
if ((demodel.SellingPrice ?? 0) < 0)
if (IsKorea ==0&&(demodel.SellingPrice ?? 0) < 0)
{
return ApiResult.ParamIsNull("请输入售价");
}
if ((demodel.OriginalPrice ?? 0) <= 0)
if (IsKorea == 0 && (demodel.OriginalPrice ?? 0) <= 0)
{
return ApiResult.ParamIsNull("请输入原价");
}
if (string.IsNullOrEmpty(demodel.Unit))
if (IsKorea == 0 && string.IsNullOrEmpty(demodel.Unit))
{
return ApiResult.ParamIsNull("请输入单位");
}
......
......@@ -203,6 +203,7 @@ namespace Mall.WebApi.Controllers.User
ERPBranchId = (erpUserInfo?.RB_Branch_id ?? -1),
ERPGroupId = (erpUserInfo?.RB_Group_id ?? 0),
IsOpenSchool = 0,
IsKorea=0,
};
UserReidsCache.UserInfoSet(UserModuleCacheKeyConfig.Mall_Login_Info + model.TenantId, obj, Config.JwtExpirTime);
return ApiResult.Success("", obj);
......
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