diff --git a/ARW.Model/Dto/Business/GoodsManager/Goodss/GoodsDto.cs b/ARW.Model/Dto/Business/GoodsManager/Goodss/GoodsDto.cs index e1960b1..1694249 100644 --- a/ARW.Model/Dto/Business/GoodsManager/Goodss/GoodsDto.cs +++ b/ARW.Model/Dto/Business/GoodsManager/Goodss/GoodsDto.cs @@ -24,8 +24,10 @@ namespace ARW.Model.Dto.Business.GoodsManager.Goodss [Required(ErrorMessage = "商品类目guid不能为空")] public long GoodsCategoryGuid { get; set; } - [Required(ErrorMessage = "商品规格guid不能为空")] - public long GoodsSkuGuid { get; set; } + public string GoodsSkuIds { get; set; } + + public string GoodsServicesIds { get; set; } + [Required(ErrorMessage = "配送模板guid不能为空")] public long DeliveryGuid { get; set; } @@ -33,7 +35,6 @@ namespace ARW.Model.Dto.Business.GoodsManager.Goodss [Required(ErrorMessage = "名称不能为空")] public string GoodsName { get; set; } - [Required(ErrorMessage = "编码不能为空")] public string GoodsCoding { get; set; } public string GoodsMainImageVideo { get; set; } @@ -48,13 +49,11 @@ namespace ARW.Model.Dto.Business.GoodsManager.Goodss [Required(ErrorMessage = "图片不能为空")] public string GoodsPicture { get; set; } - [Required(ErrorMessage = "价格(最低)不能为空")] public decimal GoodsPriceLowest { get; set; } [Required(ErrorMessage = "价格(最高)不能为空")] public decimal GoodsPriceHighest { get; set; } - [Required(ErrorMessage = "划线价格(最低)不能为空")] public decimal GoodsDashedPriceLowest { get; set; } [Required(ErrorMessage = "划线价格(最高)不能为空")] @@ -66,35 +65,34 @@ namespace ARW.Model.Dto.Business.GoodsManager.Goodss [Required(ErrorMessage = "初始销量不能为空")] public int GoodsSalesInitial { get; set; } - [Required(ErrorMessage = "实际销量不能为空")] public int GoodsSalesActual { get; set; } [Required(ErrorMessage = "详情不能为空")] public string GoodsDetails { get; set; } - [Required(ErrorMessage = "库存计算方式(1下单立减库存 2付款立减库存)不能为空")] + [Required(ErrorMessage = "库存计算方式不能为空")] public int GoodsDeductStockType { get; set; } - [Required(ErrorMessage = "是否赠送积分(1开启 0关闭)不能为空")] + [Required(ErrorMessage = "是否赠送积分不能为空")] public int GoodsIsPointsGift { get; set; } - [Required(ErrorMessage = "是否允许使用积分抵扣(1允许 0不允许)不能为空")] + [Required(ErrorMessage = "是否允许使用积分抵扣不能为空")] public int GoodsIsPointsDiscount { get; set; } - [Required(ErrorMessage = "积分抵扣设置(0默认抵扣 1单独设置抵扣)不能为空")] + [Required(ErrorMessage = "积分抵扣设置不能为空")] public int GoodsIsAlonePointsDiscount { get; set; } public string GoodsPointsDiscountConfig { get; set; } - [Required(ErrorMessage = "是否开启会员折扣(1开启 0关闭)不能为空")] + [Required(ErrorMessage = "是否开启会员折扣能为空")] public int GoodsIsEnableGrade { get; set; } - [Required(ErrorMessage = "会员折扣设置(0默认等级折扣 1单独设置折扣)不能为空")] + [Required(ErrorMessage = "会员折扣设置不能为空")] public int GoodsIsAloneGrade { get; set; } public string GoodsAloneGradeEquity { get; set; } - [Required(ErrorMessage = "上下架状态(1上架 2下架)不能为空")] + [Required(ErrorMessage = "上下架状态不能为空")] public int GoodsShelfStatus { get; set; } [Required(ErrorMessage = "排序不能为空")] @@ -129,5 +127,4 @@ namespace ARW.Model.Dto.Business.GoodsManager.Goodss - } diff --git a/ARW.Model/Models/Business/GoodsManager/Goodss/Goods.cs b/ARW.Model/Models/Business/GoodsManager/Goodss/Goods.cs index d45600a..9001768 100644 --- a/ARW.Model/Models/Business/GoodsManager/Goodss/Goods.cs +++ b/ARW.Model/Models/Business/GoodsManager/Goodss/Goods.cs @@ -59,10 +59,10 @@ namespace ARW.Model.Models.Business.GoodsManager.Goodss /// 描述 :商品规格guid /// 空值 : false /// - [EpplusTableColumn(Header = "商品规格guid")] + [EpplusTableColumn(Header = "商品规格ids")] [JsonConverter(typeof(ValueToStringConverter))] - [SugarColumn(ColumnName = "goods_sku_guid")] - public long GoodsSkuGuid { get; set; } + [SugarColumn(ColumnName = "goods_sku_ids")] + public string GoodsSkuIds { get; set; } /// diff --git a/ARW.Model/Vo/Business/GoodsManager/Goodss/GoodsVo.cs b/ARW.Model/Vo/Business/GoodsManager/Goodss/GoodsVo.cs index 42c93ef..9f3c4d0 100644 --- a/ARW.Model/Vo/Business/GoodsManager/Goodss/GoodsVo.cs +++ b/ARW.Model/Vo/Business/GoodsManager/Goodss/GoodsVo.cs @@ -53,11 +53,11 @@ namespace ARW.Model.Vo.Business.GoodsManager.Goodss /// - /// 描述 :商品规格guid + /// 描述 :商品规格ids /// [JsonConverter(typeof(ValueToStringConverter))] - [EpplusTableColumn(Header = "商品规格guid")] - public long GoodsSkuGuid { get; set; } + [EpplusIgnore] + public string GoodsSkuIds { get; set; } /// diff --git a/ARW.Service/Business/BusinessService/GoodsManager/Goodss/GoodsService.cs b/ARW.Service/Business/BusinessService/GoodsManager/Goodss/GoodsService.cs index f3e3df4..17e14b9 100644 --- a/ARW.Service/Business/BusinessService/GoodsManager/Goodss/GoodsService.cs +++ b/ARW.Service/Business/BusinessService/GoodsManager/Goodss/GoodsService.cs @@ -61,7 +61,7 @@ namespace ARW.Service.Business.BusinessService.GoodsManager.Goodss ShopGuid = s.ShopGuid, ShopName = c.ShopName, GoodsCategoryGuid = s.GoodsCategoryGuid, - GoodsSkuGuid = s.GoodsSkuGuid, + GoodsSkuIds = s.GoodsSkuIds, DeliveryGuid = s.DeliveryGuid, GoodsName = s.GoodsName, GoodsCoding = s.GoodsCoding,