diff --git a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java index 4c1b915..aa15cab 100644 --- a/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java +++ b/src/main/java/com/example/demo/Mysql/MysqlServiceImpl.java @@ -35,7 +35,7 @@ public class MysqlServiceImpl implements MysqlService { @Autowired private RestTemplate restTemplate; - Set validZeroTypes = new HashSet<>(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 11, 12, 13, 14, 18, 19, 20, 21, 22, 23, 24, 26, 28, 29, 35, 36, 40, 45, 46, 47, 48, 49, 53, 54, 60)); + Set validZeroTypes = new HashSet<>(Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 11, 12, 13, 14, 18, 19, 20, 21, 22, 23, 24, 26, 28, 29, 35, 36, 40, 45, 46, 47, 48, 49, 53, 54, 60,67)); Set validOneTypes = new HashSet<>(Arrays.asList(9, 15, 17, 25, 27, 37, 41, 42, 43, 50, 51, 62)); Set validTwoTypes = new HashSet<>(Arrays.asList(52,61)); Set validThreeTypes = new HashSet<>(Arrays.asList(10, 16, 30, 31, 32, 33, 34, 39, 44)); @@ -404,7 +404,10 @@ public class MysqlServiceImpl implements MysqlService { throw new IllegalArgumentException("不应处理 platform=4,应在上层过滤"); } else if ("0".equals(platform)) { stmt.setString(8, "初始化金币"); - } else { + } else if ("5".equals(platform)){ + stmt.setString(8, "DC"); + } + { stmt.setString(8, "其他"); } diff --git a/src/main/java/com/example/demo/Util/GoldTistV2.java b/src/main/java/com/example/demo/Util/GoldTistV2.java index a83aa5e..42d3c74 100644 --- a/src/main/java/com/example/demo/Util/GoldTistV2.java +++ b/src/main/java/com/example/demo/Util/GoldTistV2.java @@ -224,12 +224,12 @@ public class GoldTistV2 { 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; + remark+"&czr="+czr+"&yjjb="+yjjb+"&czpt=5&goodsname="+goodsname+"&type="+lx; System.out.println("签名前:"+sk); String sign = generateSignature(sk.split("&"),"222251821eba7efab6d48e388b8f6baa"); sk = desjbkc.encrypt(new String(sk.getBytes(), "UTF-8")); - System.out.println(url+"goldUpdate_sign.gold?app=5&sk="+sk+"&sign="+sign); - resp = doGet(url+"goldUpdate_sign.gold?app=5&sk="+sk+"&sign="+sign); + System.out.println(url+"goldUpdate_sign.gold?app=4&sk="+sk+"&sign="+sign); + resp = doGet(url+"goldUpdate_sign.gold?app=4&sk="+sk+"&sign="+sign); }catch (Exception e){ System.out.println("加金币异常"+e.toString()); } @@ -254,10 +254,10 @@ public class GoldTistV2 { String sjzfc = RandomUid(10); String resp = ""; try { - DESGB desjbkc = new DESGB("Jbxt.205"); + DESGB desjbkc = new DESGB("Jxbt.205"); String sk = "jwcode="+jwcode+"&type=66&uid="+sjzfc+"&remark="+ remark+"&czr="+czr+"&czpt=4&goodsname="+goodsname; - String sign = generateSignature(sk.split("&"),"222251821eba7efab6d48e388b8f6baa"); + String sign = generateSignature(sk.split("&"),"aJCQ6PcofDUybiZJI3ElC2eAQZhnF2hM"); sk = desjbkc.encrypt(new String(sk.getBytes(), "UTF-8")); resp = doGet(url+"userjbAddRecord.gold?app=4&sk="+sk+"&sign="+sign); }catch (Exception e){ @@ -269,10 +269,10 @@ public class GoldTistV2 { public static void main(String[] args) throws Exception { //调用demo - addCoinNew("94226013",63,20,"123","测试",0,"黄其振","文章11"); + addDCCoinNew("94629784",67,20,"123","测试",0,"黄其振","文章11"); } - - +//初始化类型 +// https://hcm.rzfwq.com/hwhcnewA/initTypeGold.gold } diff --git a/src/main/java/com/example/demo/controller/coin/RechargeController.java b/src/main/java/com/example/demo/controller/coin/RechargeController.java index 9dc15da..d42e1c5 100644 --- a/src/main/java/com/example/demo/controller/coin/RechargeController.java +++ b/src/main/java/com/example/demo/controller/coin/RechargeController.java @@ -160,7 +160,6 @@ public class RechargeController { } } - @Log("DC免费金币充值") @PostMapping("/addDC") public Result addDC(@RequestBody RechargeUser rechargeUser) { try { diff --git a/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java index 700a8cc..0ca7fa2 100644 --- a/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/coin/RechargeServiceImpl.java @@ -163,14 +163,12 @@ public class RechargeServiceImpl implements RechargeService { throw new SystemException("免费金币不能小于0"); } String result = GoldTistV2.addDCCoinNew(rechargeUser.getJwcode().toString(),67,rechargeUser.getFreeGold().doubleValue(),"","DC免费金币赠送",0,"DC","DC免费金币赠送"); - // 只关注 -1, -6, -7 - if ("-6".equals(result)) { - throw new SystemException(String.format("金币发放失败:类型错误(-6),jwcode=%s", rechargeUser.getJwcode())); - // 检查 lx=63 是否被支持 - } else if ("-7".equals(result)) { - throw new SystemException(String.format("金币发放失败:签名错误(-7),jwcode=%s", rechargeUser.getJwcode())); - // 检查签名逻辑或密钥 - } - return Result.success(); + + String cleanResult = result.replaceAll("\\s+", ""); + if ("1".equals(cleanResult)) { + return Result.success(); + } else { + throw new SystemException(String.format("金币发放失败:类型错误(%S),jwcode=%s", result,rechargeUser.getJwcode())); + } } }