From 18925ac98f33b0ff9134b8edd28a6a036b7b3d27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9F=A9=E9=B9=8F=E8=BE=89?= <18322780655@163.com> Date: Wed, 26 Jun 2024 14:28:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/cashierservice/service/OrderService.java | 5 +++++ .../chaozhanggui/system/cashierservice/sign/CodeEnum.java | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java index ef66fd0..f0e94a5 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java @@ -756,6 +756,7 @@ public class OrderService { if(Objects.isNull(skuInfoPos)||skuInfoPos.size()<0){ skuInfoPos=new ArrayList<>(); } + orderInfo.setSkuInfos(skuInfoPos); } PageInfo pageInfo = new PageInfo(list); @@ -1022,6 +1023,10 @@ public class OrderService { } + if(!"miniapp".equals(orderInfo.getOrderType())){ + return Result.fail(CodeEnum.ISNOTAPPORDER); + } + if("refund".equals(orderInfo.getStatus())){ return Result.fail(CodeEnum.ORDERRETURN); } diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/sign/CodeEnum.java b/src/main/java/com/chaozhanggui/system/cashierservice/sign/CodeEnum.java index db89141..0ccfc1d 100644 --- a/src/main/java/com/chaozhanggui/system/cashierservice/sign/CodeEnum.java +++ b/src/main/java/com/chaozhanggui/system/cashierservice/sign/CodeEnum.java @@ -89,11 +89,14 @@ public enum CodeEnum { ORDERRETURN("100033",false,"订单已退款","fail"), - SAMEUSER("100034",false,"相同的手机号已存在多个记录","fail"), + ISNOTAPPORDER("100035",false,"不是小程序订单","fail"), + + +