From c41740955cbac679a91cc5c6f27011775703daf7 Mon Sep 17 00:00:00 2001 From: Yen Date: Tue, 14 Mar 2023 16:33:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=A0=B8=E9=94=80=E8=B4=B9?= =?UTF-8?q?=E7=94=A8=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/bms/controller/BmsSubjectController.java | 2 +- .../com/qs/serve/modules/third/PortalController.java | 11 ----------- .../com/qs/serve/modules/third/ThirdTokenUtil.java | 2 +- .../third/entity/ProcessCreateCostApplyBo.java | 4 ++-- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java index e742a969..771cc1a8 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSubjectController.java @@ -49,7 +49,7 @@ public class BmsSubjectController { /** * 树查询 - * @param + * @param supplierId * @return */ @GetMapping("/tree") diff --git a/src/main/java/com/qs/serve/modules/third/PortalController.java b/src/main/java/com/qs/serve/modules/third/PortalController.java index 7b049192..b3ffadf8 100644 --- a/src/main/java/com/qs/serve/modules/third/PortalController.java +++ b/src/main/java/com/qs/serve/modules/third/PortalController.java @@ -1,23 +1,12 @@ package com.qs.serve.modules.third; -import cn.hutool.crypto.SecureUtil; -import com.qs.serve.common.config.DevEnvironmentConfig; import com.qs.serve.common.model.dto.R; -import com.qs.serve.common.util.Assert; -import com.qs.serve.modules.third.consts.ThirtyConst; -import com.qs.serve.modules.third.entity.ProcessCreateCostApplyBo; -import com.qs.serve.modules.third.entity.ProcessCreatePolicyCostBo; -import com.qs.serve.modules.third.service.PortalOfCostApplication; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; -import javax.validation.Valid; -import java.time.LocalDate; /** * 【第三方接口】核销系统 diff --git a/src/main/java/com/qs/serve/modules/third/ThirdTokenUtil.java b/src/main/java/com/qs/serve/modules/third/ThirdTokenUtil.java index ea533082..eca3ea25 100644 --- a/src/main/java/com/qs/serve/modules/third/ThirdTokenUtil.java +++ b/src/main/java/com/qs/serve/modules/third/ThirdTokenUtil.java @@ -20,7 +20,7 @@ public class ThirdTokenUtil { String time = LocalDate.now().toString(); String match = SecureUtil.md5(ThirtyConst.PREFIX_MD5_VALUE + time); String token = request.getHeader(ThirtyConst.TOKEN_API_PARAM); - if(token==null||token.equalsIgnoreCase(match)){ + if(token==null||!token.equalsIgnoreCase(match)){ if(DevEnvironmentConfig.isDev()){ log.error("v-token==>"+match); Assert.throwEx("请求头 v-token 为空。或token无效"); diff --git a/src/main/java/com/qs/serve/modules/third/entity/ProcessCreateCostApplyBo.java b/src/main/java/com/qs/serve/modules/third/entity/ProcessCreateCostApplyBo.java index 247e84da..74208936 100644 --- a/src/main/java/com/qs/serve/modules/third/entity/ProcessCreateCostApplyBo.java +++ b/src/main/java/com/qs/serve/modules/third/entity/ProcessCreateCostApplyBo.java @@ -25,6 +25,7 @@ public class ProcessCreateCostApplyBo { @NotNull(message = "费用主题 不能为空") private String costTheme; + private String centerCode; /** 活动标题(可为空) */ private String activityTitle; @@ -33,11 +34,10 @@ public class ProcessCreateCostApplyBo { @NotNull(message = "客户编码 不能为空") private String customerCode; - /** 暂无应用场景,记录在支付表(可为空) */ + /** 发货单号 */ private String erpCode; /** 发票号 */ - @NotNull(message = "发票号 不能为空") private String billNumber; /** 客户所属 */