From 81b7da07f419344bd40a253dd9aca8a4ea4c79b9 Mon Sep 17 00:00:00 2001 From: chc <1501738723@qq.com> Date: Fri, 12 Sep 2025 16:53:45 +0800 Subject: [PATCH 1/4] =?UTF-8?q?sql=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DB/version4.3to4.4.sql | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/DB/version4.3to4.4.sql b/DB/version4.3to4.4.sql index 18f003883..6399c452b 100644 --- a/DB/version4.3to4.4.sql +++ b/DB/version4.3to4.4.sql @@ -164,4 +164,10 @@ ALTER TABLE `li_store_flow` ADD `profit_sharing` varchar(255) NULL COMMENT '分 INSERT INTO `lilishop`.`li_setting` (`id`, `create_by`, `create_time`, `delete_flag`, `update_by`, `update_time`, `setting_value`) VALUES ('CONNECT_SETTING', 'admin', '2024-07-07 13:55:38.686000', b'0', NULL, NULL, '{\"callbackUrl\":\"https://buyer-api.pickmall.cn\",\"pc\":\"https://pc-b2b2c.pickmall.cn\",\"wap\":\"https://m-b2b2c.pickmall.cn\"}'); -UPDATE `lilishop`.`li_setting` SET `create_by` = 'admin', `create_time` = '2021-01-23 02:18:03.299000', `delete_flag` = b'0', `update_by` = 'admin', `update_time` = '2024-07-07 13:53:44.732000', `setting_value` = '{\"accessKeyId\":\"test\",\"tencentSdkAppId\":\"null\",\"registerTemplateCode\":\"SMS_205755298\",\"huaweiSender\":\"null\",\"signName\":\"lili\",\"tencentSecretId\":\"null\",\"huaweiAppKey\":\"null\",\"isTestModel\":\"true\",\"tencentSecretKey\":\"null\",\"type\":\"ALI\",\"accessSecret\":\"test\",\"tencentSignName\":\"null\",\"huaweiSignature\":\"null\",\"payPasswordTemplateCode\":\"SMS_205755301\",\"walletPasswordTemplateCode\":\"SMS_205755297\",\"findPasswordTemplateCode\":\"SMS_205755301\",\"huaweiAppSecret\":\"null\",\"loginTemplateCode\":\"SMS_205755300\"}' WHERE `id` = 'SMS_SETTING'; \ No newline at end of file +UPDATE `lilishop`.`li_setting` SET `create_by` = 'admin', `create_time` = '2021-01-23 02:18:03.299000', `delete_flag` = b'0', `update_by` = 'admin', `update_time` = '2024-07-07 13:53:44.732000', `setting_value` = '{\"accessKeyId\":\"test\",\"tencentSdkAppId\":\"null\",\"registerTemplateCode\":\"SMS_205755298\",\"huaweiSender\":\"null\",\"signName\":\"lili\",\"tencentSecretId\":\"null\",\"huaweiAppKey\":\"null\",\"isTestModel\":\"true\",\"tencentSecretKey\":\"null\",\"type\":\"ALI\",\"accessSecret\":\"test\",\"tencentSignName\":\"null\",\"huaweiSignature\":\"null\",\"payPasswordTemplateCode\":\"SMS_205755301\",\"walletPasswordTemplateCode\":\"SMS_205755297\",\"findPasswordTemplateCode\":\"SMS_205755301\",\"huaweiAppSecret\":\"null\",\"loginTemplateCode\":\"SMS_205755300\"}' WHERE `id` = 'SMS_SETTING'; + + + +ALTER TABLE li_store_logistics ADD `partner_name` varchar(255) DEFAULT NULL COMMENT '电子面单客户账户名称'; + + From f2cb6b56ea6d484a444046608fe7b17086ba9544 Mon Sep 17 00:00:00 2001 From: chc <1501738723@qq.com> Date: Tue, 23 Sep 2025 13:31:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=95=86=E5=93=81=E5=AE=A1=E6=A0=B8swagger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/lili/controller/goods/GoodsManagerController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java b/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java index 54230b03b..47a041568 100644 --- a/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java +++ b/manager-api/src/main/java/cn/lili/controller/goods/GoodsManagerController.java @@ -80,9 +80,9 @@ public class GoodsManagerController { @ApiImplicitParam(name = "authFlag", value = "审核结果", required = true, paramType = "query", dataType = "string") }) @PutMapping(value = "auth") - public ResultMessage auth(@RequestParam List goodsId, @RequestParam String authFlag) { + public ResultMessage auth(@RequestParam List goodsIds, @RequestParam String authFlag) { //校验商品是否存在 - if (goodsService.auditGoods(goodsId, GoodsAuthEnum.valueOf(authFlag))) { + if (goodsService.auditGoods(goodsIds, GoodsAuthEnum.valueOf(authFlag))) { return ResultUtil.success(); } throw new ServiceException(ResultCode.GOODS_AUTH_ERROR); From 28cc0617c373754521ed246016ccf3e6da32dbc1 Mon Sep 17 00:00:00 2001 From: chc <1501738723@qq.com> Date: Tue, 23 Sep 2025 18:06:40 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=B4=A7=E7=89=A9=E5=94=AE=E5=90=8E=E6=95=B0=E9=87=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=8C=E4=BB=A5=E9=98=B2=E6=AD=A2=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=94=AE=E5=90=8E=E6=9C=AA=E5=AE=A1=E6=A0=B8=E4=BE=9D=E7=84=B6?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/impl/OrderStatusHandlerExecute.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java b/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java index 54beb2e5c..3daeb241f 100644 --- a/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java @@ -4,6 +4,8 @@ import cn.lili.common.utils.CurrencyUtil; import cn.lili.event.AfterSaleStatusChangeEvent; import cn.lili.event.TradeEvent; import cn.lili.modules.order.aftersale.entity.dos.AfterSale; +import cn.lili.modules.order.aftersale.entity.vo.AfterSaleSearchParams; +import cn.lili.modules.order.aftersale.service.AfterSaleService; import cn.lili.modules.order.cart.entity.dto.TradeDTO; import cn.lili.modules.order.order.entity.dos.Order; import cn.lili.modules.order.order.entity.dos.OrderItem; @@ -34,6 +36,8 @@ public class OrderStatusHandlerExecute implements TradeEvent, AfterSaleStatusCha private OrderItemService orderItemService; @Autowired private OrderService orderService; + @Autowired + private AfterSaleService afterSaleService; @Override public void orderCreate(TradeDTO tradeDTO) { @@ -64,10 +68,16 @@ public class OrderStatusHandlerExecute implements TradeEvent, AfterSaleStatusCha int returnCount = 0; // 总购买数量 int deliverCount = 0; - for (OrderItem item : orderItems) { - returnCount += item.getReturnGoodsNumber(); - deliverCount += item.getNum(); + //获取订单货物已完成售后的数量 + AfterSaleSearchParams saleSearchParams = new AfterSaleSearchParams(); + saleSearchParams.setOrderSn(afterSale.getOrderSn()); + saleSearchParams.setServiceStatus(AfterSaleStatusEnum.COMPLETE.name()); + List afterSales = afterSaleService.exportAfterSaleOrder(saleSearchParams); + for (AfterSale sale : afterSales) { + returnCount += sale.getNum(); } + //订单货物购买总数 + deliverCount = order.getGoodsNum(); if (returnCount == deliverCount) { orderService.systemCancel(afterSale.getOrderSn(),"订单货物全部退款",false); } From fe0b9c37a4565505a705ceef90a0b9707e365318 Mon Sep 17 00:00:00 2001 From: chc <1501738723@qq.com> Date: Wed, 24 Sep 2025 15:20:19 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=B4=A7=E7=89=A9=E5=94=AE=E5=90=8E=E6=95=B0=E9=87=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4=EF=BC=8C=E4=BB=A5=E9=98=B2=E6=AD=A2=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=94=AE=E5=90=8E=E6=9C=AA=E5=AE=A1=E6=A0=B8=E4=BE=9D=E7=84=B6?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../event/impl/OrderStatusHandlerExecute.java | 2 +- .../entity/vo/AfterSaleSearchParams.java | 27 ++++++++++--------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java b/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java index 3daeb241f..d97c48f05 100644 --- a/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java +++ b/consumer/src/main/java/cn/lili/event/impl/OrderStatusHandlerExecute.java @@ -84,4 +84,4 @@ public class OrderStatusHandlerExecute implements TradeEvent, AfterSaleStatusCha } } -} +} \ No newline at end of file diff --git a/framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleSearchParams.java b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleSearchParams.java index 369ce2f29..880fde85d 100644 --- a/framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleSearchParams.java +++ b/framework/src/main/java/cn/lili/modules/order/aftersale/entity/vo/AfterSaleSearchParams.java @@ -86,20 +86,23 @@ public class AfterSaleSearchParams extends PageVO { if (CharSequenceUtil.isNotEmpty(orderSn)) { queryWrapper.like("order_sn", orderSn); } - //按买家查询 - if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MEMBER.name())) { - queryWrapper.eq("member_id", UserContext.getCurrentUser().getId()); - } - //按卖家查询 - if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name())) { - queryWrapper.eq("store_id", UserContext.getCurrentUser().getStoreId()); + if(UserContext.getCurrentUser() != null){ + //按买家查询 + if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MEMBER.name())) { + queryWrapper.eq("member_id", UserContext.getCurrentUser().getId()); + } + //按卖家查询 + if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.STORE.name())) { + queryWrapper.eq("store_id", UserContext.getCurrentUser().getStoreId()); + } + + if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MANAGER.name()) + && CharSequenceUtil.isNotEmpty(storeId) + ) { + queryWrapper.eq("store_id", storeId); + } } - if (CharSequenceUtil.equals(UserContext.getCurrentUser().getRole().name(), UserEnums.MANAGER.name()) - && CharSequenceUtil.isNotEmpty(storeId) - ) { - queryWrapper.eq("store_id", storeId); - } if (CharSequenceUtil.isNotEmpty(memberName)) { queryWrapper.like("member_name", memberName); }