diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java index 4150064d..4bb05ff9 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/productimpl/TbProductServiceImpl.java @@ -472,6 +472,9 @@ public class TbProductServiceImpl implements TbProductService { } //保存到sku_result if ("sku".equals(resources.getTypeEnum())) { + if (StringUtils.isNotBlank(resources.getSkuSnap())) { + resources.setSkuSnap(resources.getSkuSnap().replace("label", "name")); + } TbProductSkuResult productSkuResult = new TbProductSkuResult(); productSkuResult.setCreatedAt(Instant.now().toEpochMilli()); productSkuResult.setUpdatedAt(Instant.now().toEpochMilli()); @@ -526,7 +529,7 @@ public class TbProductServiceImpl implements TbProductService { if (!"group".equals(product.getTypeEnum())) { if (resources.getCategoryId() == null) throw new BadRequestException("商品分类不可为空"); product.setGroupSnap(null); - if (resources.getNotices() != null && resources.getNotices().getId() != null) { + if (resources.getNotices() != null && resources.getNotices().getId() != null && resources.getNotices().getId() > 0) { noticeRepository.deleteById(resources.getNotices().getId()); } } @@ -573,6 +576,9 @@ public class TbProductServiceImpl implements TbProductService { } //保存到sku_result if ("sku".equals(resources.getTypeEnum())) { + if (StringUtils.isNotBlank(resources.getSkuSnap())) { + resources.setSkuSnap(resources.getSkuSnap().replace("label", "name")); + } TbProductSkuResult productSkuResult = new TbProductSkuResult(); productSkuResult.setCreatedAt(Instant.now().toEpochMilli()); productSkuResult.setUpdatedAt(Instant.now().toEpochMilli()); @@ -857,6 +863,8 @@ public class TbProductServiceImpl implements TbProductService { } public static void main(String[] args) { - + String str="[{\"label\":\"温度\",\"value\":\"热,冰,少冰\"}]"; + str=str.replace("label", "name"); + System.out.println(str); } } diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/DictDetail.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/DictDetail.java index 277edf4e..65a2b3c3 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/DictDetail.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/DictDetail.java @@ -1,15 +1,14 @@ package cn.ysk.cashier.system.domain; +import cn.ysk.cashier.base.BaseEntity; import io.swagger.annotations.ApiModelProperty; -import io.swagger.models.auth.In; import lombok.Getter; import lombok.Setter; -import cn.ysk.cashier.base.BaseEntity; + import javax.persistence.*; import javax.validation.constraints.NotNull; import java.io.Serializable; -import java.util.List; /** * @author Zheng Jie @@ -29,7 +28,7 @@ public class DictDetail extends BaseEntity implements Serializable { private Long id; @JoinColumn(name = "dict_id") - @ManyToOne(fetch=FetchType.LAZY) + @ManyToOne(fetch=FetchType.EAGER) @ApiModelProperty(value = "字典", hidden = true) private Dict dict; diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Role.java b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Role.java index ed5f1df3..8afd4b07 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Role.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/system/domain/Role.java @@ -1,12 +1,12 @@ package cn.ysk.cashier.system.domain; +import cn.ysk.cashier.base.BaseEntity; +import cn.ysk.cashier.utils.enums.DataScopeEnum; import com.alibaba.fastjson.annotation.JSONField; import io.swagger.annotations.ApiModelProperty; import lombok.Getter; import lombok.Setter; -import cn.ysk.cashier.base.BaseEntity; -import cn.ysk.cashier.utils.enums.DataScopeEnum; import javax.persistence.*; import javax.validation.constraints.NotBlank; @@ -45,7 +45,7 @@ public class Role extends BaseEntity implements Serializable { @ApiModelProperty(value = "菜单", hidden = true) private Set