BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：档口库存系统选择初始化调整；

pull/1121/head
liujiang 2025-10-14 15:51:42 +08:00
parent ee57f4fdad
commit 0b750b53c8
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/store/StoreAuditVO.java
View File

@ -30,5 +30,7 @@ public class StoreAuditVO {
private String rejectReason; private String rejectReason;
@ApiModelProperty(value = "档口认证信息") @ApiModelProperty(value = "档口认证信息")
private StoreCertCreateVO storeCert; private StoreCertCreateVO storeCert;
@ApiModelProperty(value = "库存系统 1步橘 2天友 3发货宝")
private Integer stockSys;
} }

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/vo/storeCertificate/StoreCertCreateVO.java
View File

@ -65,8 +65,6 @@ public class StoreCertCreateVO {
private String facAddress; private String facAddress;
@ApiModelProperty(value = "生产规模") @ApiModelProperty(value = "生产规模")
private Integer prodScale; private Integer prodScale;
@ApiModelProperty(value = "库存系统 1步橘 2天友 3发货宝")
private Integer stockSys;
} }
@Data @Data

2
xkt/src/main/java/com/ruoyi/xkt/dto/store/StoreAuditDTO.java
View File

@ -22,5 +22,7 @@ public class StoreAuditDTO {
private String rejectReason; private String rejectReason;
@ApiModelProperty(value = "档口认证信息") @ApiModelProperty(value = "档口认证信息")
private StoreCertDTO storeCert; private StoreCertDTO storeCert;
@ApiModelProperty(value = "库存系统 1步橘 2天友 3发货宝")
private Integer stockSys;
} }

2
xkt/src/main/java/com/ruoyi/xkt/dto/storeCertificate/StoreCertDTO.java
View File

@ -50,8 +50,6 @@ public class StoreCertDTO {
private String facAddress; private String facAddress;
@ApiModelProperty(value = "生产规模") @ApiModelProperty(value = "生产规模")
private Integer prodScale; private Integer prodScale;
@ApiModelProperty(value = "库存系统 1步橘 2天友 3发货宝")
private Integer stockSys;
} }
@Data @Data

6
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreServiceImpl.java
View File

@ -157,17 +157,17 @@ public class StoreServiceImpl implements IStoreService {
throw new ServiceException("当前状态不为待审核 或 审核驳回，不可审核!", HttpStatus.ERROR); throw new ServiceException("当前状态不为待审核 或 审核驳回，不可审核!", HttpStatus.ERROR);
} }
// 如果库存系统为空 则报错 // 如果库存系统为空 则报错
if (ObjectUtils.isEmpty(auditDTO.getStoreCert().getStoreBasic().getStockSys())) { if (ObjectUtils.isEmpty(auditDTO.getStockSys())) {
throw new ServiceException("库存系统不能为空!", HttpStatus.ERROR); throw new ServiceException("库存系统不能为空!", HttpStatus.ERROR);
} }
// 判断库存系统的值在系统是否存在 // 判断库存系统的值在系统是否存在
StockSysType.of(auditDTO.getStoreCert().getStoreBasic().getStockSys()); StockSysType.of(auditDTO.getStockSys());
auditDTO.getStoreCert().setStoreId(auditDTO.getStoreId()); auditDTO.getStoreCert().setStoreId(auditDTO.getStoreId());
// 更新档口认证信息 // 更新档口认证信息
this.updateStoreCert(auditDTO.getStoreCert()); this.updateStoreCert(auditDTO.getStoreCert());
store.setStoreStatus(StoreStatus.TRIAL_PERIOD.getValue()); store.setStoreStatus(StoreStatus.TRIAL_PERIOD.getValue());
store.setRejectReason(""); store.setRejectReason("");
store.setStockSys(auditDTO.getStoreCert().getStoreBasic().getStockSys()); store.setStockSys(auditDTO.getStockSys());
// 将store存到redis中 // 将store存到redis中
redisCache.setCacheObject(CacheConstants.STORE_KEY + store.getId(), store); redisCache.setCacheObject(CacheConstants.STORE_KEY + store.getId(), store);
} else { } else {