From c5b2c7fd3a02d7334bb8cb9e995f839d022c4be8 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Tue, 14 Oct 2025 12:58:35 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=A1=A3=E5=8F=A3=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E6=97=B6=EF=BC=8C=E5=88=9D=E5=A7=8B=E5=8C=96=E5=BA=93?= =?UTF-8?q?=E5=AD=98=E7=B3=BB=E7=BB=9F=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xkt/vo/storeCertificate/StoreCertCreateVO.java | 2 ++ .../com/ruoyi/xkt/dto/storeCertificate/StoreCertDTO.java | 2 ++ .../java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java | 7 +++++++ 3 files changed, 11 insertions(+) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCertificate/StoreCertCreateVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCertificate/StoreCertCreateVO.java index a3c286dbc..9adb4f325 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCertificate/StoreCertCreateVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCertificate/StoreCertCreateVO.java @@ -65,6 +65,8 @@ public class StoreCertCreateVO { private String facAddress; @ApiModelProperty(value = "生产规模") private Integer prodScale; + @ApiModelProperty(value = "库存系统 1步橘 2天友 3发货宝") + private Integer stockSys; } @Data diff --git a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCertificate/StoreCertDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCertificate/StoreCertDTO.java index 7ed785674..3f79c119d 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/storeCertificate/StoreCertDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/storeCertificate/StoreCertDTO.java @@ -50,6 +50,8 @@ public class StoreCertDTO { private String facAddress; @ApiModelProperty(value = "生产规模") private Integer prodScale; + @ApiModelProperty(value = "库存系统 1步橘 2天友 3发货宝") + private Integer stockSys; } @Data diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java index 9bf7650d5..3786a29f4 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java @@ -156,11 +156,18 @@ public class StoreServiceImpl implements IStoreService { !Objects.equals(store.getStoreStatus(), StoreStatus.AUDIT_REJECTED.getValue())) { throw new ServiceException("当前状态不为待审核 或 审核驳回,不可审核!", HttpStatus.ERROR); } + // 如果库存系统为空 则报错 + if (ObjectUtils.isEmpty(auditDTO.getStoreCert().getStoreBasic().getStockSys())) { + throw new ServiceException("库存系统不能为空!", HttpStatus.ERROR); + } + // 判断库存系统的值在系统是否存在 + StockSysType.of(auditDTO.getStoreCert().getStoreBasic().getStockSys()); auditDTO.getStoreCert().setStoreId(auditDTO.getStoreId()); // 更新档口认证信息 this.updateStoreCert(auditDTO.getStoreCert()); store.setStoreStatus(StoreStatus.TRIAL_PERIOD.getValue()); store.setRejectReason(""); + store.setStockSys(auditDTO.getStoreCert().getStoreBasic().getStockSys()); // 将store存到redis中 redisCache.setCacheObject(CacheConstants.STORE_KEY + store.getId(), store); } else {