From 8426294a0fcf6e049f72ac13e23187b62913b221 Mon Sep 17 00:00:00 2001 From: paulGao Date: Wed, 8 Jun 2022 16:35:44 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=AD=98=E5=9C=A8=E6=9D=A1=E4=BB=B6=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E4=BC=A0=E9=80=92=E9=A1=BA=E5=BA=8F=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/lili/modules/member/serviceimpl/MemberServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java index 27e04bbe..415a1d85 100644 --- a/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/member/serviceimpl/MemberServiceImpl.java @@ -681,7 +681,7 @@ public class MemberServiceImpl extends ServiceImpl impleme */ private void checkMember(String userName, String mobilePhone) { //判断手机号是否存在 - if (findMember(userName, mobilePhone) > 0) { + if (findMember(mobilePhone, userName) > 0) { throw new ServiceException(ResultCode.USER_EXIST); } } From 478ba2048a50ddd316a2020b6f1efaff589fe46a Mon Sep 17 00:00:00 2001 From: paulGao Date: Thu, 9 Jun 2022 09:13:13 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?= =?UTF-8?q?=E6=9C=89=E6=95=88=E6=80=A7=E5=88=A4=E5=AE=9A=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=95=86=E5=93=81=E6=9B=B4=E6=96=B0=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=AF=94=E8=BE=83=E6=94=B9=E4=B8=BA=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E6=AF=94=E8=BE=83=EF=BC=88?= =?UTF-8?q?=E5=9B=A0=E4=BF=AE=E6=94=B9=E4=BA=86=E5=95=86=E5=93=81=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E9=80=BB=E8=BE=91=EF=BC=8C=E6=AF=8F=E6=AC=A1=E9=83=BD?= =?UTF-8?q?=E6=98=AF=E5=88=A0=E9=99=A4=E5=90=8E=E6=96=B0=E5=A2=9E=EF=BC=8C?= =?UTF-8?q?=E6=89=80=E4=BB=A5=E6=97=A0=E5=95=86=E5=93=81=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=97=B6=E9=97=B4=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lili/modules/goods/entity/dos/GoodsSku.java | 6 +++--- .../modules/order/cart/render/impl/CheckDataRender.java | 2 +- .../cn/lili/modules/order/cart/service/CartServiceImpl.java | 2 +- framework/src/main/java/cn/lili/mybatis/BaseEntity.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java index ebe97e91..0c89fdc1 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/GoodsSku.java @@ -171,11 +171,11 @@ public class GoodsSku extends BaseEntity { } @Override - public Date getUpdateTime() { - if (super.getUpdateTime() == null) { + public Date getCreateTime() { + if (super.getCreateTime() == null) { return new Date(1593571928); } else { - return super.getUpdateTime(); + return super.getCreateTime(); } } diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java index 8cb02a48..5b5fb2a7 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/CheckDataRender.java @@ -107,7 +107,7 @@ public class CheckDataRender implements CartRenderStep { //缓存中的商品信息 GoodsSku dataSku = goodsSkuService.getGoodsSkuByIdFromCache(cartSkuVO.getGoodsSku().getId()); //商品有效性判定 - if (dataSku == null || dataSku.getUpdateTime().before(cartSkuVO.getGoodsSku().getUpdateTime())) { + if (dataSku == null || dataSku.getCreateTime().after(cartSkuVO.getGoodsSku().getCreateTime())) { //设置购物车未选中 cartSkuVO.setChecked(false); //设置购物车此sku商品已失效 diff --git a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java index 7b44ed78..3a45ded2 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/service/CartServiceImpl.java @@ -150,7 +150,7 @@ public class CartServiceImpl implements CartService { //购物车中已经存在，更新数量 - if (cartSkuVO != null && dataSku.getUpdateTime().equals(cartSkuVO.getGoodsSku().getUpdateTime())) { + if (cartSkuVO != null && dataSku.getCreateTime().equals(cartSkuVO.getGoodsSku().getCreateTime())) { //如果覆盖购物车中商品数量 if (Boolean.TRUE.equals(cover)) { diff --git a/framework/src/main/java/cn/lili/mybatis/BaseEntity.java b/framework/src/main/java/cn/lili/mybatis/BaseEntity.java index ab73d591..126c6cbc 100644 --- a/framework/src/main/java/cn/lili/mybatis/BaseEntity.java +++ b/framework/src/main/java/cn/lili/mybatis/BaseEntity.java @@ -64,7 +64,7 @@ public abstract class BaseEntity implements Serializable { @LastModifiedDate @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @TableField(fill = FieldFill.UPDATE) + @TableField(fill = FieldFill.INSERT_UPDATE) @ApiModelProperty(value = "更新时间", hidden = true) @Field(type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss || yyyy-MM-dd || yyyy/MM/dd HH:mm:ss|| yyyy/MM/dd ||epoch_millis") private Date updateTime; From 5e6a56e193280f2b5978792710df498efa1f3a3e Mon Sep 17 00:00:00 2001 From: paulGao Date: Thu, 9 Jun 2022 09:15:57 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E4=B8=80=E4=B8=AA=E5=8F=AF=E8=83=BD?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E7=9A=84=E8=8E=B7=E5=8F=96=E5=95=86=E5=93=81?= =?UTF-8?q?=E5=88=86=E7=B1=BB=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../goods/serviceimpl/StoreGoodsLabelServiceImpl.java | 2 +- .../modules/order/cart/render/impl/SkuFreightRender.java | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StoreGoodsLabelServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StoreGoodsLabelServiceImpl.java index 6d5a7d8d..6d5f9a0e 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StoreGoodsLabelServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/StoreGoodsLabelServiceImpl.java @@ -56,7 +56,7 @@ public class StoreGoodsLabelServiceImpl extends ServiceImpl storeGoodsLabelVOChildList = new ArrayList<>(); list.stream() - .filter(label -> label.getParentId().equals(storeGoodsLabel.getId())) + .filter(label -> label.getParentId() != null && label.getParentId().equals(storeGoodsLabel.getId())) .forEach(storeGoodsLabelChild -> storeGoodsLabelVOChildList.add(new StoreGoodsLabelVO(storeGoodsLabelChild.getId(), storeGoodsLabelChild.getLabelName(), storeGoodsLabelChild.getLevel(), storeGoodsLabelChild.getSortOrder()))); storeGoodsLabelVO.setChildren(storeGoodsLabelVOChildList); storeGoodsLabelVOList.add(storeGoodsLabelVO); diff --git a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java index e7e7cc31..799c62b8 100644 --- a/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java +++ b/framework/src/main/java/cn/lili/modules/order/cart/render/impl/SkuFreightRender.java @@ -11,7 +11,6 @@ import cn.lili.modules.store.entity.dto.FreightTemplateChildDTO; import cn.lili.modules.store.entity.enums.FreightTemplateEnum; import cn.lili.modules.store.entity.vos.FreightTemplateVO; import cn.lili.modules.store.service.FreightTemplateService; -import org.apache.xmlbeans.impl.store.Cur; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -51,16 +50,16 @@ public class SkuFreightRender implements CartRenderStep { Map> freightGroups = freightTemplateGrouping(cartSkuVOS); //循环运费模版 - for (String freightTemplateId : freightGroups.keySet()) { + for (Map.Entry> freightTemplateGroup : freightGroups.entrySet()) { //商品id列表 - List skuIds = freightGroups.get(freightTemplateId); + List skuIds = freightTemplateGroup.getValue(); //当前购物车商品列表 List currentCartSkus = cartSkuVOS.stream().filter(item -> skuIds.contains(item.getGoodsSku().getId())).collect(Collectors.toList()); //寻找对应对商品运费计算模版 - FreightTemplateVO freightTemplate = freightTemplateService.getFreightTemplate(freightTemplateId); + FreightTemplateVO freightTemplate = freightTemplateService.getFreightTemplate(freightTemplateGroup.getKey()); if (freightTemplate != null && freightTemplate.getFreightTemplateChildList() != null && !freightTemplate.getFreightTemplateChildList().isEmpty()) { @@ -99,7 +98,7 @@ public class SkuFreightRender implements CartRenderStep { Double count = currentCartSkus.stream().mapToDouble(item -> // 根据计费规则 累加计费基数 freightTemplateChildDTO.getPricingMethod().equals(FreightTemplateEnum.NUM.name()) ? - item.getNum() : + item.getNum().doubleValue() : CurrencyUtil.mul(item.getNum(), item.getGoodsSku().getWeight()) ).sum();