yitisheng
/
yitisheng-new-api
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates

This commit is contained in:
zhouwentao 2024-06-26 12:14:04 +08:00
parent 69322f5b6a
commit 4c0926b02b
4 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/controller/MiniPayApiController.java
View File

@ -397,7 +397,7 @@ public class MiniPayApiController {
String orderCode = msgJson.getString("order_id"); String orderCode = msgJson.getString("order_id");
String cpRefundNo = msgJson.getString("cp_refundno"); String cpRefundNo = msgJson.getString("cp_refundno");
String refundNo = msgJson.getString("refund_no"); 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); YxOrder yxOrder = yxOrderService.updateRefund(orderCode, cpRefundNo, refundNo, refundAmount);
// 更改当前用户的状态 // 更改当前用户的状态

12
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/mini/douyin/util/DouYinUtil.java
View File

@ -125,13 +125,13 @@ public class DouYinUtil {
} }
public static void main(String[] args) { public static void main(String[] args) {
/*String orderCode = "ORD240625150801447"; String orderCode = "ORD240626071158295";
//String notifyUrl = "https://yitisheng.vip/jbt/mini/pay/v1/dy/payNotify"; String notifyUrl = "https://yitisheng.vip/jbt/mini/pay/v1/dy/payNotify";
String notifyUrl = "https://yitisheng.vip/py/dy/payNotify"; // String notifyUrl = "https://yitisheng.vip/py/dy/payNotify";
Long refundAmount = 100l; Long refundAmount = 100l;
String appId = "tt59a72f1ac6964bfa01"; String appId = "tt59a72f1ac6964bfa01";
orderRefund(orderCode,appId,refundAmount,"wODf6Bg5BXndJ3IELXNb1w5CDMRjatXAmZVP2DQ7",notifyUrl);*/ orderRefund(orderCode,appId,refundAmount,"wODf6Bg5BXndJ3IELXNb1w5CDMRjatXAmZVP2DQ7",notifyUrl);
long time = new Date().getTime(); /* 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\":\"秒达工具箱\"}"; 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; JSONObject jsonObject = null;
for (int i = 0; i < 10000; i++) { for (int i = 0; i < 10000; i++) {
@ -149,7 +149,7 @@ public class DouYinUtil {
endTime = new Date().getTime(); endTime = new Date().getTime();
System.out.println("hutool json耗时："); System.out.println("hutool json耗时：");
System.out.println(endTime-time); System.out.println(endTime-time);*/
// String openId="_000-8dokDbb5cDgK7gdSNOJrzIBFQZNqOrO"; // String openId="_000-8dokDbb5cDgK7gdSNOJrzIBFQZNqOrO";
// String appId="tt59a72f1ac6964bfa01"; // String appId="tt59a72f1ac6964bfa01";

3
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/web/controller/ArtRecommendMajorController.java
View File

@ -156,6 +156,9 @@ public class ArtRecommendMajorController {
} }
//根据录取方式，计算折合分数 //根据录取方式，计算折合分数
for (String rulesEnrollProbability : maps.keySet()) { for (String rulesEnrollProbability : maps.keySet()) {
if (StringUtils.isBlank(rulesEnrollProbability)) {
continue;
}
Optional<YxSchoolMajor> any = schooMajorList.stream().filter(s -> s.getRulesEnrollProbability().equals(rulesEnrollProbability)).findAny(); Optional<YxSchoolMajor> any = schooMajorList.stream().filter(s -> s.getRulesEnrollProbability().equals(rulesEnrollProbability)).findAny();
if (any.isPresent()) { if (any.isPresent()) {
YxSchoolMajor yxSchoolMajor = any.get(); YxSchoolMajor yxSchoolMajor = any.get();

9
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxScoreController.java
View File

@ -174,10 +174,13 @@ public class YxScoreController {
yxUserScore.setProfessionalScore(oldProfessionalScore); yxUserScore.setProfessionalScore(oldProfessionalScore);
} }
} }
String batch = "高职高专"; String batch = "本科A段";
if (professionalScore != null && professionalScore.compareTo(YxConstant.bigDecimal0) > 0) { if (professionalCategory.contains("体育类")) {
batch = ScoreUtil.conversionScoreBatch(culturalScore, professionalScore, historyScoreControlLineList); batch = "本科";
} }
/*if (professionalScore != null && professionalScore.compareTo(YxConstant.bigDecimal0) > 0) {
batch = ScoreUtil.conversionScoreBatch(culturalScore, professionalScore, historyScoreControlLineList);
}*/
//================批次 end //================批次 end
//根据批次，判断 本科/高职高专 //根据批次，判断 本科/高职高专