diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreAuditVO.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreAuditVO.java index 437433e39..b95bc5451 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreAuditVO.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreAuditVO.java @@ -30,5 +30,7 @@ public class StoreAuditVO { private String rejectReason; @ApiModelProperty(value = "档口认证信息") private StoreCertCreateVO storeCert; + @ApiModelProperty(value = "库存系统 1步橘 2天友 3发货宝") + private Integer stockSys; } 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 9adb4f325..a3c286dbc 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,8 +65,6 @@ 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/store/StoreAuditDTO.java b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreAuditDTO.java index c152c3b49..72c2b7e0b 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreAuditDTO.java +++ b/xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreAuditDTO.java @@ -22,5 +22,7 @@ public class StoreAuditDTO { private String rejectReason; @ApiModelProperty(value = "档口认证信息") private StoreCertDTO storeCert; + @ApiModelProperty(value = "库存系统 1步橘 2天友 3发货宝") + private Integer stockSys; } 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 3f79c119d..7ed785674 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,8 +50,6 @@ 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 3786a29f4..bff46e6b0 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 @@ -157,17 +157,17 @@ public class StoreServiceImpl implements IStoreService { throw new ServiceException("当前状态不为待审核 或 审核驳回,不可审核!", HttpStatus.ERROR); } // 如果库存系统为空 则报错 - if (ObjectUtils.isEmpty(auditDTO.getStoreCert().getStoreBasic().getStockSys())) { + if (ObjectUtils.isEmpty(auditDTO.getStockSys())) { throw new ServiceException("库存系统不能为空!", HttpStatus.ERROR); } // 判断库存系统的值在系统是否存在 - StockSysType.of(auditDTO.getStoreCert().getStoreBasic().getStockSys()); + StockSysType.of(auditDTO.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.setStockSys(auditDTO.getStockSys()); // 将store存到redis中 redisCache.setCacheObject(CacheConstants.STORE_KEY + store.getId(), store); } else {