From d729cb816eba54d3505a06dddfafb8c12096bc52 Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 14 Sep 2023 11:26:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8E=A5=E5=8F=A3;=E7=BC=96?= =?UTF-8?q?=E7=A0=81=E5=8C=BA=E5=88=86=E6=B5=8B=E8=AF=95=E6=95=B0=E6=8D=AE?= =?UTF-8?q?;=E8=B0=83=E6=95=B4=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mvc/HttpServletRequestFilter.java | 9 +-- .../com/qs/serve/common/util/CodeGenUtil.java | 5 +- .../tbs/controller/TbsCostTodoController.java | 10 ++- .../modules/third/PortalOfCostController.java | 3 + .../VtbVerificationDataController.java | 23 ++++++ .../vtb/entity/so/VtbActivityCheckSo.java | 5 ++ .../vtb/entity/so/VtbVerificationCheckSo.java | 5 ++ .../mapper/vtb/VtbVerReportMapper.xml | 72 ++++++++++--------- 8 files changed, 87 insertions(+), 45 deletions(-) diff --git a/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java b/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java index 11ac0373..0a547567 100644 --- a/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java +++ b/src/main/java/com/qs/serve/common/framework/mvc/HttpServletRequestFilter.java @@ -1,5 +1,6 @@ package com.qs.serve.common.framework.mvc; +import com.qs.serve.common.config.DevEnvironmentConfig; import com.qs.serve.common.framework.security.model.LoginUser; import com.qs.serve.common.util.AuthContextUtils; import com.qs.serve.common.util.DateUtils; @@ -76,10 +77,10 @@ public class HttpServletRequestFilter implements Filter{ if(!StringUtils.isEmpty(queryStr)){ buffer.append("\n参数: "+queryStr); } -// if(!StringUtils.isEmpty(reqBody)){ -// buffer.append("\n请求体: "+reqBody); -// } - if(diffTime>1){ + if(DevEnvironmentConfig.isDev() &&!StringUtils.isEmpty(reqBody)){ + buffer.append("\n请求体: "+reqBody); + } + if(diffTime>0.6D){ buffer.append("\n耗时: "+diffTime+"秒"); } try { diff --git a/src/main/java/com/qs/serve/common/util/CodeGenUtil.java b/src/main/java/com/qs/serve/common/util/CodeGenUtil.java index d6953d27..b0bde2b9 100644 --- a/src/main/java/com/qs/serve/common/util/CodeGenUtil.java +++ b/src/main/java/com/qs/serve/common/util/CodeGenUtil.java @@ -1,6 +1,7 @@ package com.qs.serve.common.util; import cn.hutool.core.util.IdUtil; +import com.qs.serve.common.config.DevEnvironmentConfig; import com.qs.serve.common.framework.redis.RedisService; import lombok.AllArgsConstructor; import lombok.Getter; @@ -94,7 +95,9 @@ public class CodeGenUtil { for (int i = (appendStr+digitsNum).length(); i < 3; i++) { appendZeros.append("0"); } - return digitsNum + appendZeros + appendStr; + //用于区分测试环境数据 + String subflex = DevEnvironmentConfig.isDev()?"T":""; + return digitsNum + appendZeros + appendStr+subflex; } public static String getDataCode(SourceDataKey dataKey){ diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoController.java index c1727bda..654ff8bb 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostTodoController.java @@ -80,14 +80,13 @@ public class TbsCostTodoController { * @return */ @PostMapping("/updateById") - public R updateById(@RequestBody @Valid TbsCostTodoBo param){ - TbsCostTodo entity = CopierUtil.copy(param,new TbsCostTodo()); + public R updateById(@RequestBody @Valid TbsCostTodo param){ String userId = AuthContextUtils.getSysUserId(); TbsCostTodo tbsCostTodo = tbsCostTodoService.getById(param.getId()); if(!tbsCostTodo.getCreateBy().equals(userId)){ return R.ok(); } - boolean result = tbsCostTodoService.updateById(entity); + boolean result = tbsCostTodoService.updateById(param); return R.isTrue(result); } @@ -97,9 +96,8 @@ public class TbsCostTodoController { * @return */ @PostMapping("/save") - public R save(@RequestBody @Valid TbsCostTodoBo param){ - TbsCostTodo entity = CopierUtil.copy(param,new TbsCostTodo()); - boolean result = tbsCostTodoService.save(entity); + public R save(@RequestBody @Valid TbsCostTodo param){ + boolean result = tbsCostTodoService.save(param); return R.isTrue(result); } diff --git a/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java b/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java index 6c6addf0..c11b5eab 100644 --- a/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java +++ b/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java @@ -60,6 +60,9 @@ public class PortalOfCostController { return R.error(e.getMessage()); } sysSyncLogService.save(syncLog); + if(syncLog.getSuccessStatus()!=null&&syncLog.getSuccessStatus().equals(1)){ + return R.ok(); + } return R.error("支付异常"); } diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java index cafd70ee..fac664ba 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationDataController.java @@ -38,6 +38,7 @@ public class VtbVerificationDataController { public R> getActivityData(VtbActivityCheckSo query){ Long count = verReportMapper.countActivityCheck(query); if(count>0){ + query.setOpenPage(1); query.setStartRow(PageUtil.getStartRow()); List list = verReportMapper.pageActivityCheck(query); PageVo page = new PageVo<>(); @@ -48,6 +49,17 @@ public class VtbVerificationDataController { return R.byEmptyList(); } + /** + * 获取活动的核销情况(导出) + * @param query + * @return + */ + @GetMapping("exportActivityCheck") + public R> exportActivityData(VtbActivityCheckSo query){ + List list = verReportMapper.pageActivityCheck(query); + return R.ok(list); + } + /** * 获取核销的支付信息 * @param query @@ -57,6 +69,7 @@ public class VtbVerificationDataController { public R> getVerificationData(VtbVerificationCheckSo query){ Long count = verReportMapper.countVerificationCheck(query); if(count>0){ + query.setOpenPage(1); query.setStartRow(PageUtil.getStartRow()); List list = verReportMapper.pageVerificationCheck(query); PageVo page = new PageVo<>(); @@ -67,5 +80,15 @@ public class VtbVerificationDataController { return R.byEmptyList(); } + /** + * 获取核销的支付信息(导出) + * @param query + * @return + */ + @GetMapping("exportVerificationCheck") + public R> exportVerificationCheck(VtbVerificationCheckSo query){ + List list = verReportMapper.pageVerificationCheck(query); + return R.ok(list); + } } diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbActivityCheckSo.java b/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbActivityCheckSo.java index 5460a63a..a0e14d69 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbActivityCheckSo.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbActivityCheckSo.java @@ -55,4 +55,9 @@ public class VtbActivityCheckSo { private Integer startRow; + /** + * 当openPage=1时,进行翻页(后台维护) + */ + private Integer openPage; + } diff --git a/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationCheckSo.java b/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationCheckSo.java index 3b3282b4..4a2fd2ab 100644 --- a/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationCheckSo.java +++ b/src/main/java/com/qs/serve/modules/vtb/entity/so/VtbVerificationCheckSo.java @@ -48,4 +48,9 @@ public class VtbVerificationCheckSo { private Integer pageSize; private Integer startRow; + + /** + * 当openPage=1时,进行翻页(后台维护) + */ + private Integer openPage; } diff --git a/src/main/resources/mapper/vtb/VtbVerReportMapper.xml b/src/main/resources/mapper/vtb/VtbVerReportMapper.xml index be385929..572671c2 100644 --- a/src/main/resources/mapper/vtb/VtbVerReportMapper.xml +++ b/src/main/resources/mapper/vtb/VtbVerReportMapper.xml @@ -20,49 +20,51 @@ and `tbs_cost_apply`.`charge_theme` like concat('%',#{query.costTitle},'%') - - - - + + + +