From d44e314290a29bc60f590b5528c5b190fdf903b9 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 14 Mar 2024 16:03:08 +0800 Subject: [PATCH] fix: debug --- .../bms/controller/BmsSupplierController.java | 15 +++++++++++++++ .../bms/entity/bo/BmsSupplierExcelBo.java | 16 ++++++++++++++++ .../oms/service/impl/OmsOrderServiceImpl.java | 6 +++++- .../sys/controller/SysUserController.java | 1 + .../tbs/controller/TbsCostApplyController.java | 2 +- .../tbs/service/impl/TbsActivityServiceImpl.java | 6 ++++++ .../controller/VtbVerificationController.java | 10 ++++++++++ .../VtbVerificationOperationServiceImpl.java | 4 ++-- 8 files changed, 56 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index a908fe6b..3461802b 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -885,6 +885,21 @@ public class BmsSupplierController { if(!StringUtils.hasText(a.getSalesRegionName())){ a.setErrorInfo(a.getErrorInfo()+"销售区域不能为空;"); } + if(a.getSupplierInfoFlag()==null){ + a.setErrorInfo(a.getErrorInfo()+"供应商信息是否必填不能空;"); + } + if(a.getSupplierInfoFlag()!=null&&a.getSupplierInfoFlag().equals(1)){ + if(!StringUtils.hasText(a.getSupplierTaxNumber())){ + a.setErrorInfo(a.getErrorInfo()+"税号不能为空;"); + } + if(!StringUtils.hasText(a.getSupplierUser())){ + a.setErrorInfo(a.getErrorInfo()+"供应商联系人不能为空;"); + } + if(!StringUtils.hasText(a.getSupplierLicenseImg())){ + a.setErrorInfo(a.getErrorInfo()+"营业执照地址不能为空;"); + } + } + if(!StringUtils.hasText(a.getFirstLevelAdministrativeRegionName())){ a.setErrorInfo(a.getErrorInfo()+"省不能为空;"); } diff --git a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java index 40f36554..c6686752 100644 --- a/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java +++ b/src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierExcelBo.java @@ -80,6 +80,22 @@ public class BmsSupplierExcelBo { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private LocalDateTime suspendCooperationDate; + /** 供应商是否填写信息 */ + @NotNull(message = "供应商是否填写信息不能为空") + private Integer supplierInfoFlag; + + /** 供应商税号 */ + @Length(max = 255,message = "供应商税号长度不能超过255字") + private String supplierTaxNumber; + + /** 供应商联系人 */ + @Length(max = 255,message = "供应商联系人长度不能超过255字") + private String supplierUser; + + /** 营业执照地址 */ + @Length(max = 255,message = "营业执照地址长度不能超过255字") + private String supplierLicenseImg; + // 创建时间 private LocalDateTime createTime; diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java index b1c8ec5f..221b6414 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java @@ -696,7 +696,11 @@ public class OmsOrderServiceImpl extends ServiceImpl im xltOrderItem.setSpuCode(orderItem.getSpuCode()); boolean eq = orderItem.getSkuCode().equals(orderItem.getSpuCode()); if(!StringUtils.hasText(orderItem.getSkuCode())||eq){ - Assert.throwEx("SKU【"+orderItem.getSpuCode()+"】存货缺失，请联系档案负责人"); + GoodsSku sku = goodsSkuService.getById(orderItem.getSkuId()); + GoodsSpu spu = goodsSpuService.getById(orderItem.getSpuId()); + if(!sku.getSkuCode().equals(spu.getSpuCode())){ + Assert.throwEx("SKU【"+orderItem.getSpuCode()+"】存货缺失，请联系档案负责人"); + } } xltOrderItem.setChanPinBianHao(orderItem.getSkuCode()); xltOrderItem.setChanPinDanWei(orderItem.getSkuUnit()); diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java index 7a425b15..84aa2caf 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java +++ b/src/main/java/com/qs/serve/modules/sys/controller/SysUserController.java @@ -357,6 +357,7 @@ public class SysUserController { } param.setServingState(0); param.setId("SU"+IdUtil.getSnowFlakeId()); + param.setServingState(1); boolean result = sysUserService.save(param); // if(param.getId()!=null&& com.qs.serve.common.util.CollectionUtil.isNotEmpty(userBo.getRoleIds())){ // sysRoleService.saveUserRole4Edit(userBo.getRoleIds(),param.getId()); diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 45668b6c..7df1e293 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -121,7 +121,7 @@ public class TbsCostApplyController { * @param id * @return */ - @DeleteMapping("/removeCostById/{id}") + @PostMapping("/removeCostById/{id}") public R removeCostById(@PathVariable("id") Long id){ tbsCostApplyService.removeCostById(id); return R.ok(); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java index ed780929..e7b84ae8 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java @@ -377,7 +377,13 @@ public class TbsActivityServiceImpl extends ServiceImpl toPayDev(){ + Long[] ids = new Long[]{ + + }; + for (Long id : ids) { + vtbVerificationService.toPayRequest(id); + } + return R.ok(); + } // @GetMapping("delCaPay") // public R delCaPay(){ diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java index c8be94cf..a6703c2e 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java @@ -110,8 +110,8 @@ public class VtbVerificationOperationServiceImpl implements SeeYonOperationServi tbsActivityService.updateById(activity); } TbsActivity tbsActivity = tbsActivityService.getById(verification.getActivityId()); - if(tbsActivity.getCurrVerificationId()!=null && tbsActivity.getCurrVerificationId().equals(verification.getId().toString())&& - //if( + //if(tbsActivity.getCurrVerificationId()!=null && tbsActivity.getCurrVerificationId().equals(verification.getId().toString())&& + if( tbsActivity.getActivityState().equals(TbsActivityState.STATE_1_Checking)){ //还原活动为待核销状态 TbsActivity activity = new TbsActivity();