From 2d36fa1f6bfa22563e7cd48dcbe80456bc30f96c Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 31 Oct 2024 15:10:56 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/ysk/cashier/cons/service/impl/TbConCheckServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConCheckServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConCheckServiceImpl.java index e32e43c6..d4358b77 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConCheckServiceImpl.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConCheckServiceImpl.java @@ -75,7 +75,7 @@ public class TbConCheckServiceImpl implements TbConCheckService { } TbConsInfoFlow flow=new TbConsInfoFlow(); - if(consInfo.getStockNumber().compareTo(resources.getStockNumber())>=0){ + if((consInfo.getStockNumber().subtract(consInfo.getStockConsume())).compareTo(resources.getStockNumber())>=0){ flow.setBizCode("checkStockOut"); flow.setBizName("盘点出库"); flow.setBizType("-"); From 54512eef0ca31e7ed6a3e16bfe627216772cbe31 Mon Sep 17 00:00:00 2001 From: GYJ <1157756119@qq.com> Date: Sat, 9 Nov 2024 11:26:00 +0800 Subject: [PATCH 2/7] org.springframework.data.domain.Pageable --- .../main/java/cn/ysk/cashier/config/fastJsonConfig.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/config/fastJsonConfig.java b/eladmin-system/src/main/java/cn/ysk/cashier/config/fastJsonConfig.java index e675ebfe..54b7f797 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/config/fastJsonConfig.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/config/fastJsonConfig.java @@ -4,8 +4,10 @@ import com.alibaba.fastjson.serializer.SerializerFeature; import com.alibaba.fastjson.support.config.FastJsonConfig; import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; import org.springframework.context.annotation.Configuration; +import org.springframework.data.web.PageableHandlerMethodArgumentResolver; import org.springframework.http.MediaType; import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport; import java.nio.charset.Charset; @@ -17,6 +19,7 @@ public class fastJsonConfig extends WebMvcConfigurationSupport { /** * 使用阿里 fastjson 作为JSON MessageConverter + * * @param converters */ @Override @@ -45,4 +48,10 @@ public class fastJsonConfig extends WebMvcConfigurationSupport { converter.setSupportedMediaTypes(mediaTypeList); converters.add(converter); } + + @Override + public void addArgumentResolvers(List argumentResolvers) { + // 注册Spring data jpa pageable的参数分解器 + argumentResolvers.add(new PageableHandlerMethodArgumentResolver()); + } } From fef40eac6e4de0a68f462fdb5905a67e645f96b6 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 11 Nov 2024 11:20:45 +0800 Subject: [PATCH 3/7] =?UTF-8?q?skuResult=20label=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/productimpl/TbProductServiceImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 a694e328..d61f8bd6 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 @@ -474,6 +474,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()); @@ -577,6 +580,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()); @@ -863,6 +869,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); } } From b9d3d781290eee377fb59b28513f3eff3d44115f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Mon, 18 Nov 2024 14:56:33 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BB=B6=E8=BF=9F?= =?UTF-8?q?=E5=8A=A0=E8=BD=BDbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/ysk/cashier/system/domain/DictDetail.java | 7 +++---- .../src/main/java/cn/ysk/cashier/system/domain/Role.java | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) 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 menus; - @ManyToMany + @ManyToMany(fetch = FetchType.EAGER) @JoinTable(name = "sys_roles_depts", joinColumns = {@JoinColumn(name = "role_id",referencedColumnName = "role_id")}, inverseJoinColumns = {@JoinColumn(name = "dept_id",referencedColumnName = "dept_id")}) From 36f45f6be5df52ef698c1a8d99ecbd69de6c0ea0 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 18 Nov 2024 17:44:56 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=88=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/ysk/cashier/mybatis/entity/TbShopShare.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopShare.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopShare.java index 757bba78..dd517168 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopShare.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopShare.java @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.apache.commons.lang3.StringUtils; @@ -36,10 +37,12 @@ public class TbShopShare extends Model { private String invitedImg; //被邀顶部图 private String beInvitedImg; - //活动开始时间 - private Date startTime; //活动结束时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endTime; + //活动开始时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date startTime; //新用户获得券 private String newCoupon; //邀请num人数 可获奖励券 From 20aebe1f4dbec32e2455f06c20537cb8cac68af1 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Mon, 18 Nov 2024 17:52:58 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E5=88=86=E4=BA=AB=E6=B4=BB=E5=8A=A8=20?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/ysk/cashier/mybatis/entity/TbShopShare.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopShare.java b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopShare.java index dd517168..00ac8cbb 100644 --- a/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopShare.java +++ b/eladmin-system/src/main/java/cn/ysk/cashier/mybatis/entity/TbShopShare.java @@ -38,11 +38,9 @@ public class TbShopShare extends Model { //被邀顶部图 private String beInvitedImg; //活动结束时间 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date endTime; + private String endTime; //活动开始时间 - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date startTime; + private String startTime; //新用户获得券 private String newCoupon; //邀请num人数 可获奖励券 From aae4ecc9f78430172859ae18371bdb2a2bb504a1 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 19 Nov 2024 10:37:28 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cashier/service/impl/productimpl/TbProductServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d61f8bd6..0533e627 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 @@ -532,7 +532,7 @@ public class TbProductServiceImpl implements TbProductService { if (resources.getCategoryId() == null) throw new BadRequestException("商品分类不可为空"); product.setIsCombo(0); 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()); } }