From 4c0926b02b8841086390f466171e38dc098d08ee Mon Sep 17 00:00:00 2001 From: zhouwentao <1577701412@qq.com> Date: Wed, 26 Jun 2024 12:14:04 +0800 Subject: [PATCH] updates --- .../mini/controller/MiniPayApiController.java | 2 +- .../jeecg/modules/mini/douyin/util/DouYinUtil.java | 12 ++++++------ .../web/controller/ArtRecommendMajorController.java | 3 +++ .../modules/yx/controller/YxScoreController.java | 9 ++++++--- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniPayApiController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniPayApiController.java index 3adab56..6a0a920 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniPayApiController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniPayApiController.java @@ -397,7 +397,7 @@ public class MiniPayApiController { String orderCode = msgJson.getString("order_id"); String cpRefundNo = msgJson.getString("cp_refundno"); String refundNo = msgJson.getString("refund_no"); - BigDecimal refundAmount = msgJson.getBigDecimal("refund_amount").divide(YxConstant.bigDecimal100, 2, RoundingMode.HALF_UP); + BigDecimal refundAmount = msgJson.getBigDecimal("refund_amount"); // 执行更改订单状态 YxOrder yxOrder = yxOrderService.updateRefund(orderCode, cpRefundNo, refundNo, refundAmount); // 更改当前用户的状态 diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/douyin/util/DouYinUtil.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/douyin/util/DouYinUtil.java index 4ac480e..6bf5669 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/douyin/util/DouYinUtil.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/douyin/util/DouYinUtil.java @@ -125,13 +125,13 @@ public class DouYinUtil { } public static void main(String[] args) { - /*String orderCode = "ORD240625150801447"; - //String notifyUrl = "https://yitisheng.vip/jbt/mini/pay/v1/dy/payNotify"; - String notifyUrl = "https://yitisheng.vip/py/dy/payNotify"; + String orderCode = "ORD240626071158295"; + String notifyUrl = "https://yitisheng.vip/jbt/mini/pay/v1/dy/payNotify"; +// String notifyUrl = "https://yitisheng.vip/py/dy/payNotify"; Long refundAmount = 100l; String appId = "tt59a72f1ac6964bfa01"; - orderRefund(orderCode,appId,refundAmount,"wODf6Bg5BXndJ3IELXNb1w5CDMRjatXAmZVP2DQ7",notifyUrl);*/ - long time = new Date().getTime(); + orderRefund(orderCode,appId,refundAmount,"wODf6Bg5BXndJ3IELXNb1w5CDMRjatXAmZVP2DQ7",notifyUrl); + /* long time = new Date().getTime(); String js="{\"count\":7800,\"dates\":[\"2016-09\",\"2018-06\",\"2019-07\",\"2020-01\",\"2022-03\",\"2024-05\"],\"description\":\"☘\uFE0F 如果喜欢秒达工具箱，请收藏和分享本网址MDGJX.COM(首拼缩写)\",\"info\":{\"codeGenTarget\":\"ES5\",\"extraLibs\":[],\"info\":{\"codeGenTarget\":\"ES5\",\"extraLibs\":[],\"info\":{\"codeGenTarget\":\"ES5\",\"extraLibs\":[],\"info\":{\"codeGenTarget\":\"ES5\",\"extraLibs\":[],\"moduleGenTarget\":\"\",\"noImplicitAny\":true,\"noLib\":false,\"scope\":\"/\",\"semanticValidation\":true,\"syntaxValidation\":true},\"moduleGenTarget\":\"\",\"noImplicitAny\":true,\"noLib\":false,\"scope\":\"/\",\"semanticValidation\":true,\"syntaxValidation\":true},\"moduleGenTarget\":\"\",\"noImplicitAny\":true,\"noLib\":false,\"scope\":\"/\",\"semanticValidation\":true,\"syntaxValidation\":true},\"moduleGenTarget\":\"\",\"noImplicitAny\":true,\"noLib\":false,\"scope\":\"/\",\"semanticValidation\":true,\"syntaxValidation\":true},\"link\":\"https://mdgjx.com\",\"name\":\"秒达工具箱\"}"; JSONObject jsonObject = null; for (int i = 0; i < 10000; i++) { @@ -149,7 +149,7 @@ public class DouYinUtil { endTime = new Date().getTime(); System.out.println("hutool json耗时："); - System.out.println(endTime-time); + System.out.println(endTime-time);*/ // String openId="_000-8dokDbb5cDgK7gdSNOJrzIBFQZNqOrO"; // String appId="tt59a72f1ac6964bfa01"; diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtRecommendMajorController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtRecommendMajorController.java index 7c98e5b..fede783 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtRecommendMajorController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtRecommendMajorController.java @@ -156,6 +156,9 @@ public class ArtRecommendMajorController { } //根据录取方式，计算折合分数 for (String rulesEnrollProbability : maps.keySet()) { + if (StringUtils.isBlank(rulesEnrollProbability)) { + continue; + } Optional any = schooMajorList.stream().filter(s -> s.getRulesEnrollProbability().equals(rulesEnrollProbability)).findAny(); if (any.isPresent()) { YxSchoolMajor yxSchoolMajor = any.get(); diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java index 890bc67..ecdcb1c 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java @@ -174,10 +174,13 @@ public class YxScoreController { yxUserScore.setProfessionalScore(oldProfessionalScore); } } - String batch = "高职高专"; - if (professionalScore != null && professionalScore.compareTo(YxConstant.bigDecimal0) > 0) { - batch = ScoreUtil.conversionScoreBatch(culturalScore, professionalScore, historyScoreControlLineList); + String batch = "本科A段"; + if (professionalCategory.contains("体育类")) { + batch = "本科"; } + /*if (professionalScore != null && professionalScore.compareTo(YxConstant.bigDecimal0) > 0) { + batch = ScoreUtil.conversionScoreBatch(culturalScore, professionalScore, historyScoreControlLineList); + }*/ //================批次 end //根据批次，判断 本科/高职高专