From c5c48535a3d0ca162d9998d3c8d3f4b29293f098 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 3 Jul 2025 14:32:16 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20=E7=9B=B4=E6=8E=A5=E6=94=AF?= =?UTF-8?q?=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/oms/controller/api/OmsSaleOrderApi.java | 3 +++ .../java/com/qs/serve/modules/sys/entity/SysUser.java | 3 --- .../com/qs/serve/modules/tbs/common/TbsSeeYonConst.java | 9 +++++++++ .../modules/tbs/controller/TbsCostApplyController.java | 1 + .../qs/serve/modules/tbs/entity/TbsActivityTemplate.java | 2 +- .../com/qs/serve/modules/tbs/entity/TbsCostApply.java | 5 +++++ .../modules/tbs/entity/bo/TbsActivityTemplateBo.java | 3 +++ .../qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java | 1 + .../tbs/service/impl/TbsCostApplyServiceImpl.java | 5 +++-- .../qs/serve/modules/vtb/common/VerificationUtil.java | 2 +- .../com/qs/serve/modules/vtb/entity/VtbVerification.java | 6 ++++++ .../serve/modules/vtb/entity/bo/VtbVerificationBo.java | 3 +++ .../vtb/entity/bo/VtbVerificationSubjectCommitBo.java | 6 ++++++ .../vtb/service/impl/VtbVerificationServiceImpl.java | 9 ++++++++- 14 files changed, 50 insertions(+), 8 deletions(-) diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java index 29fc7c9..afa2077 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/api/OmsSaleOrderApi.java @@ -401,6 +401,9 @@ public class OmsSaleOrderApi { for (OmsSaleOrderItem orderItem : list) { GoodsSpu goodsSpu = goodsSpuService.getById(orderItem.getSpuId()); + if (goodsSpu == null){ + Assert.throwEx("商品SKU不可以用或被移除："+orderItem.getSpuCode()); + } GoodsCategory goodsCategory = goodsCategoryService.getById(goodsSpu.getCategoryLast()); orderItem.setCategoryInfo(goodsCategory); orderItem.setSpuInfo(goodsSpu); diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java index f9b407f..26a49a1 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/sys/entity/SysUser.java @@ -125,9 +125,6 @@ public class SysUser implements Serializable { @TableField(fill = FieldFill.UPDATE) private LocalDateTime updateTime; - - - /** 更新人 */ @TableField(fill = FieldFill.UPDATE) private String updateBy; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java index b2529b1..12ea150 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/common/TbsSeeYonConst.java @@ -39,6 +39,15 @@ public interface TbsSeeYonConst { //public static String Id(){return DevEnvironmentConfig.isDev()?"8370474123848467567":"5117622466085866816";} } + /** 核销自动支付 */ + class CostCheckConf_AOUTPAY{ + public static String Code(){ + return DevEnvironmentConfig.isDev()?"PayBill_Test":"PayBill"; + } + //public static String Id(){return DevEnvironmentConfig.isDev()?"8370474123848467567":"5117622466085866816";} + } + + /** 核销 */ class BatchCostCheckConf{ //public static String Id(){return DevEnvironmentConfig.isDev()?"6989459208782694349":"7718060534670183779";} diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 6b68f2a..8647d39 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -429,6 +429,7 @@ public class TbsCostApplyController { entity.setCode(CodeGenUtil.generate(CodeGenUtil.SourceKey.CostApply)); entity.setTemplateId(param.getTemplateId()); entity.setTemplateTitle(param.getTemplateTitle()); + entity.setDirectPayFlag(activityTemplate.getPayFlag()); entity.setMatchType(1); activityBo.setTemplateId(param.getTemplateId()); activityBo.setTemplateTitle(param.getTemplateTitle()); diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplate.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplate.java index c69d008..5dac20f 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplate.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivityTemplate.java @@ -66,7 +66,7 @@ public class TbsActivityTemplate implements Serializable { /** 合同类型:0->常规；1->协议类；2->进场费 */ private Integer contractFlag; - /** 支付标识(用于费用的核销) */ + /** 支付标识(用于费用的核销，是否直接支付) */ private Integer payFlag; /** 费用申请主题 */ diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java index 074e676..e73b839 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java @@ -250,6 +250,11 @@ public class TbsCostApply implements Serializable { * 自动核销状态:0-无需自动核销；1-需自动核销；2-已自动核销 */ private Integer autoCheckState; + + /** + * 核销支持直接支付：0-否；1-是 + */ + private Integer directPayFlag; @TableField(exist = false) private String affairId; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityTemplateBo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityTemplateBo.java index 9c0539a..9acff2b 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityTemplateBo.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityTemplateBo.java @@ -101,5 +101,8 @@ public class TbsActivityTemplateBo implements Serializable { * 1、只能选择客户，2、只能选择供应商，3、可以选择客户和供应商 */ private Integer selectType; + + private Integer payFlag; + } diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java index fa71071..656dd7b 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java @@ -108,6 +108,7 @@ public class TbsCostSubItem { } private String chengBenZhongXin; private String chengBenZhongXinId; + private String chengBenZhongXinType; private String budgetName; private String centertype; private String centerCode; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index 58a8df3..7d0db4b 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -1710,17 +1710,18 @@ public class TbsCostApplyServiceImpl extends ServiceImpl budgetNames = centerBudgetMap.get(costCenter.getChengBenZhongXinId()); if (CollUtil.isNotEmpty(budgetNames)){ - log.warn("有预算日志"); for (String budgetName : budgetNames) { TbsCostSubItem.CostCenterTranStr copy = CopierUtil.copy(costCenter,new TbsCostSubItem.CostCenterTranStr()); + copy.setChengBenZhongXinType(center.getCenterType()); copy.setBudgetName(budgetName); subList.add(copy); } }else { - log.warn("无预算日志"); + costCenter.setChengBenZhongXinType(center.getCenterType()); subList.add(costCenter); } } diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/common/VerificationUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/common/VerificationUtil.java index 363f4fb..95a1ff4 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/common/VerificationUtil.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/common/VerificationUtil.java @@ -30,7 +30,7 @@ public class VerificationUtil { } public static void stop(StopWatch stopWatch,boolean printFlag,String code){ stopWatch.stop(); - if (printFlag){ + if (stopWatch.getTotalTimeMillis()>7000&&printFlag){ log.error("\n耗时统计，核销[{}]耗时记录：\n{}",code,stopWatch.prettyPrint(TimeUnit.MILLISECONDS)); } } diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java index f3e7dc0..db24e15 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/VtbVerification.java @@ -217,6 +217,12 @@ public class VtbVerification implements Serializable { */ private Integer autoCheckState; + /** + * 直接支付：0-否；1-是 + */ + private Integer directPayFlag; + + @TableField(exist = false) private List attachList; diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationBo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationBo.java index 8d5df33..91a323a 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationBo.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationBo.java @@ -66,5 +66,8 @@ public class VtbVerificationBo implements Serializable { /** 是否系统自动执行 */ private Integer autoFlag; + /** 是否直接支付(这个值取反 0-表示直接支付；1-表示不直接支付) */ + private Integer directPayFlag; + } diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationSubjectCommitBo.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationSubjectCommitBo.java index 7bac2bd..7c7697d 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationSubjectCommitBo.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/entity/bo/VtbVerificationSubjectCommitBo.java @@ -47,5 +47,11 @@ public class VtbVerificationSubjectCommitBo implements Serializable { /** 是否释放 */ private Integer inputReleaseFlag; + + /** + * 直接支付：0-否；1-是 + */ + private Integer directPayFlag; + } diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index f08561f..0fe3604 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -829,6 +829,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl