From 9e8aa7f223d616bda1c64262d450b776b441216c Mon Sep 17 00:00:00 2001 From: lifenlong Date: Wed, 11 Aug 2021 22:52:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=84=E5=88=86?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BA100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/lili/modules/goods/entity/dos/Goods.java | 1 + .../cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java | 1 + 2 files changed, 2 insertions(+) diff --git a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java index 6e92ee79..cd73c2d9 100644 --- a/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java +++ b/framework/src/main/java/cn/lili/modules/goods/entity/dos/Goods.java @@ -229,6 +229,7 @@ public class Goods extends BaseEntity { //如果立即上架则 this.marketEnable = goodsOperationDTO.getRelease() ? GoodsStatusEnum.UPPER.name() : GoodsStatusEnum.DOWN.name(); this.goodsType = goodsOperationDTO.getGoodsType(); + this.grade = 100D; //循环sku,判定sku是否有效 for (Map sku : goodsOperationDTO.getSkuList()) { diff --git a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java index bfbe6ff5..7aa75018 100644 --- a/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/goods/serviceimpl/GoodsSkuServiceImpl.java @@ -588,6 +588,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl i sku.setIntro(goods.getIntro()); sku.setMobileIntro(goods.getMobileIntro()); sku.setGoodsUnit(goods.getGoodsUnit()); + sku.setGrade(100D); //商品状态 sku.setIsAuth(goods.getIsAuth()); sku.setSalesModel(goods.getSalesModel()); From 700d2eb401eea6bc6c2f2d89bf1393edfb5edf2f Mon Sep 17 00:00:00 2001 From: lifenlong Date: Wed, 11 Aug 2021 23:17:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BF=AB=E9=80=92=E9=B8=9F=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E6=B5=8B=E8=AF=95=E6=8E=A5=E5=8F=A3=EF=BC=8C=E6=AD=A3?= =?UTF-8?q?=E5=BC=8F=E7=89=88=E6=8E=A5=E5=8F=A3=E4=B8=BA8002/8001?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lili/modules/system/serviceimpl/LogisticsServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/main/java/cn/lili/modules/system/serviceimpl/LogisticsServiceImpl.java b/framework/src/main/java/cn/lili/modules/system/serviceimpl/LogisticsServiceImpl.java index 80e52cfc..26722cf9 100644 --- a/framework/src/main/java/cn/lili/modules/system/serviceimpl/LogisticsServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/system/serviceimpl/LogisticsServiceImpl.java @@ -91,7 +91,7 @@ public class LogisticsServiceImpl extends ServiceImpl params = new HashMap(8); params.put("RequestData", urlEncoder(requestData, "UTF-8")); params.put("EBusinessID", EBusinessID); - params.put("RequestType", "8001"); + params.put("RequestType", "1002"); String dataSign = encrypt(requestData, AppKey, "UTF-8"); params.put("DataSign", urlEncoder(dataSign, "UTF-8")); params.put("DataType", "2");