diff --git a/src/main/java/com/example/demo/Util/BaseDES3.java b/src/main/java/com/example/demo/Util/BaseDES3.java index 4e1e5e8..523e115 100644 --- a/src/main/java/com/example/demo/Util/BaseDES3.java +++ b/src/main/java/com/example/demo/Util/BaseDES3.java @@ -91,7 +91,7 @@ public class BaseDES3 { public static void main(String args[]) { try { BaseDES3 d = new BaseDES3(); - String encryptedText = d.encrypt("90035176"); + String encryptedText = d.encrypt("90043884"); System.out.println("加密结果：" + encryptedText); } catch (Exception e) { e.printStackTrace(); diff --git a/src/main/java/com/example/demo/Util/GoldTistV2.java b/src/main/java/com/example/demo/Util/GoldTistV2.java index 04b87f2..970c804 100644 --- a/src/main/java/com/example/demo/Util/GoldTistV2.java +++ b/src/main/java/com/example/demo/Util/GoldTistV2.java @@ -199,6 +199,7 @@ public class GoldTistV2 { String sjzfc = RandomUid(10); String resp = ""; try { + DESGB desjbkc = new DESGB("Jbxt.205"); String sk = "jwcode="+jwcode+"&number="+jbs+"&uid="+sjzfc+"&remark="+ remark+"&czr="+czr+"&yjjb="+yjjb+"&czpt=4&goodsname="+goodsname+"&type="+lx; diff --git a/src/main/java/com/example/demo/service/Temporary/RedService.java b/src/main/java/com/example/demo/service/Temporary/RedService.java index b95c8b4..a5e178a 100644 --- a/src/main/java/com/example/demo/service/Temporary/RedService.java +++ b/src/main/java/com/example/demo/service/Temporary/RedService.java @@ -24,4 +24,6 @@ public interface RedService { String sendConsumeJwcode(Integer jwcode, List redIds ); List selectRedList(Integer jwcode); + + } diff --git a/src/main/java/com/example/demo/serviceImpl/Temporary/RedServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/Temporary/RedServiceImpl.java index b88e6d6..9b7f7be 100644 --- a/src/main/java/com/example/demo/serviceImpl/Temporary/RedServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/Temporary/RedServiceImpl.java @@ -133,7 +133,7 @@ public class RedServiceImpl implements RedService { try { String body = JSON.toJSONString(java.util.Map.of("jwcode", jwcode,"coupon_ids",redIds)); HttpRequest request = HttpRequest.newBuilder() - .uri(URI.create(BASE_URLDev + CONSUME_PATH)) //URL记得换 + .uri(URI.create(BASE_URLProd + CONSUME_PATH)) //URL记得换 .header("Content-Type", "application/json") .POST(HttpRequest.BodyPublishers.ofString(body)) .build(); @@ -163,10 +163,10 @@ public class RedServiceImpl implements RedService { "token", token )); - log.debug("请求红包列表，用户ID: {}, URL: {}", jwcode, BASE_URLDev + PATHLIST); + log.debug("请求红包列表，用户ID: {}, URL: {}", jwcode, BASE_URLProd + PATHLIST); HttpRequest request = HttpRequest.newBuilder() - .uri(URI.create(BASE_URLDev + PATHLIST)) + .uri(URI.create(BASE_URLProd + PATHLIST)) .timeout(Duration.ofSeconds(10)) // ⭐ 加超时防止线程阻塞 .header("Content-Type", "application/json") .POST(HttpRequest.BodyPublishers.ofString(body)) diff --git a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java index dbbf49e..0ed11aa 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/ConsumeServiceImpl.java @@ -103,11 +103,10 @@ public class ConsumeServiceImpl implements ConsumeService { if (consumeUser.getTaskGold().compareTo(BigDecimal.ZERO) < 0 || consumeUser.getFreeGold().compareTo(BigDecimal.ZERO) < 0 || consumeUser.getPermanentGold().compareTo(BigDecimal.ZERO) < 0) { return Result.error("金币不能为负数"); } - if(consumeUser.getJwcode()<10000000||consumeUser.getJwcode()>99999999) - { + if (consumeUser.getJwcode() < 10000000 || consumeUser.getJwcode() > 99999999) { return Result.error("精网号位数小于8位或大于8位"); } - if(consumeUser.getAdminName()==null){ + if (consumeUser.getAdminName() == null) { return Result.error("管理员不能为空"); } GoldUser goldUser = userMapper.selectUser(consumeUser.getJwcode().toString()); @@ -161,27 +160,27 @@ public class ConsumeServiceImpl implements ConsumeService { userGoldRecord.setAuditStatus(1); userGoldRecord.setCreateTime(new Date()); userGoldRecord.setPayTime(new Date()); - + if (consumeUser.getPermanentGold().compareTo(BigDecimal.ZERO)!=0||consumeUser.getFreeGold().compareTo(BigDecimal.ZERO)!=0||consumeUser.getTaskGold().compareTo(BigDecimal.ZERO)!=0){ // if(consumeUser.getJwcode().equals(94226013)){ - String result= GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 65, + String result = GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 65, (double) (userGoldRecord.getPermanentGold() + userGoldRecord.getFreeDecember() + userGoldRecord.getFreeJune() + userGoldRecord.getTaskGold()) / 100, - userGoldRecord.getRemark(),0, consumeUser.getAdminName(), userGoldRecord.getGoodsName()); + userGoldRecord.getRemark(), 0, consumeUser.getAdminName(), userGoldRecord.getGoodsName()); // System.out.println("9"+result+"9"); result = result.replaceAll("[\r\n]", ""); //返回状态１加成功２减成功其他失败 -5 金币不足 -6 类型错误 -7签名错误 - if(!result.equals("2")){ - result= GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 65, + if (!result.equals("2")) { + result = GoldTistV2.addCoinNew(userGoldRecord.getJwcode().toString(), 65, (double) (userGoldRecord.getPermanentGold() + userGoldRecord.getFreeDecember() + userGoldRecord.getFreeJune() + userGoldRecord.getTaskGold()) / 100, userGoldRecord.getRemark(), 0, consumeUser.getAdminName(), userGoldRecord.getGoodsName()); //返回状态１加成功２减成功其他失败 -5 金币不足 -6 类型错误 -7签名错误 - if(!result.equals("2")){ + if (!result.equals("2")) { String errorMsg = "减金币失败，数据未进erp，返回状态：" + result; log.error(errorMsg); // 保留日志记录，便于问题排查 throw new SystemException(errorMsg); // 抛出系统异常，中断流程并传递错误信息 } } - + } consumeMapper.add(userGoldRecord); consumeMapper.updateUserGold(userGoldRecord); User user = new User(); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 9e9dc79..cd3e9ae 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -91,6 +91,7 @@ spring: file: upload: url: http://39.101.133.168:8828/hljw/api/aws/upload + feishu: webhook: url: https://open.feishu.cn/open-apis/bot/v2/hook/384c78aa-8df1-498b-9c47-04e890ed9877 @@ -102,5 +103,6 @@ bean: url: http://39.101.133.168:8828/hljwgo/api/wallet/pay red: url: http://39.101.133.168:8828/scms + urllogin: http://39.101.133.168:8828/hljwgo server: port: 10704 \ No newline at end of file diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml index 849e10b..d5bcebd 100644 --- a/src/main/resources/application-prod.yml +++ b/src/main/resources/application-prod.yml @@ -94,7 +94,6 @@ spring: file: upload: url: http://api.homilychart.com/hljw/api/aws/upload - urllogin: https://api.homilychart.com/hljwgo feishu: webhook: url: https://open.feishu.cn/open-apis/bot/v2/hook/1a515b19-b64f-46b7-9486-35842b9539fe @@ -106,5 +105,6 @@ bean: url: http://api.homilychart.com/hljwgo/api/wallet/pay red: url: https://api.homilychart.com/scms + urllogin: https://api.homilychart.com/hljwgo server: port: 10705