diff --git a/conf/szwh.properties b/conf/szwh.properties index b62b3e5..cde62e2 100644 --- a/conf/szwh.properties +++ b/conf/szwh.properties @@ -14,7 +14,10 @@ entrust.pem.token=KHXT0V7NVLOFPS9BZ88R5VLIH5COPULV distribute.pem.prikey.path=/conf/cert/distribute/private_key.pem distribute.pem.pubkey.path=/conf/cert/distribute/public_key.pem distribute.pem.token=4b4858543056374e564c4f4650533942 - +# 获取委托编码 +apply.pem.prikey.path=/conf/cert/entrust/private_key.pem +apply.pem.pubkey.path=/conf/cert/entrust/public_key.pem +apply.pem.token=4b4858543056374e564c4f4650533942 # 分发系统地址 # ENTRUST_URL = http://10.24.4.14:51317 ENTRUST_URL = http://10.14.1.173:9528 diff --git a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java index 82cdd06..ab37658 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/OrderServiceImpl.java @@ -200,7 +200,7 @@ public class OrderServiceImpl implements OrderService { } // 取订单商品的人 - OrderUser ogdu = orderUserMapper.getUserOrder(ogd.getBatchcode().toString(), ogd.getEntrustIslicode()); + OrderUser ogdu = orderUserMapper.getUserOrder(ogd.getBatchcode(), ogd.getEntrustIslicode()); if(ogdu!=null) { // 如果已经有记录了 if (StringUtils.isNotBlank(entrustName)) { diff --git a/src/main/java/cn/chjyj/szwh/service/impl/PayServiceImpl.java b/src/main/java/cn/chjyj/szwh/service/impl/PayServiceImpl.java index c30ca0b..79888e3 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/PayServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/PayServiceImpl.java @@ -119,6 +119,7 @@ public class PayServiceImpl implements PayService { JSONObject aplinkCodeJson = SzwhApiUtils.getApplyLinkCode(odgd.getSourcedataIslicode(), buyIslicode, ratio, transCount, dateStr, batchcode); log.info("订单合约编号:" + aplinkCodeJson); + // 法一 存在data 节点 if(!aplinkCodeJson.isEmpty()) { //非空 JSONArray aparr = aplinkCodeJson.getJSONArray("data"); JSONObject lkcjson = (JSONObject) aparr.get(0); diff --git a/src/main/java/cn/chjyj/szwh/utils/SignUtils.java b/src/main/java/cn/chjyj/szwh/utils/SignUtils.java index e021f40..d7ec129 100644 --- a/src/main/java/cn/chjyj/szwh/utils/SignUtils.java +++ b/src/main/java/cn/chjyj/szwh/utils/SignUtils.java @@ -57,6 +57,18 @@ public class SignUtils { return umap; } + /** + * 委托系统编号 + * @return + */ + private static Map applyMap(){ + Map umap = new HashMap(); + umap.put("private_key", ProperUtils.getSzwhProp("apply.pem.prikey.path")); + umap.put("public_key", ProperUtils.getSzwhProp("apply.pem.pubkey.path")); + umap.put("pem_token", ProperUtils.getSzwhProp("apply.pem.token")); + return umap; + } + /** * 资源下载map * @@ -87,6 +99,9 @@ public class SignUtils { case "entrust": nmap = entrustMap(); break; + case "apply": + nmap = applyMap(); + break; case "distribute": nmap = distributeMap(); break; diff --git a/src/main/java/cn/chjyj/szwh/utils/SzwhApiUtils.java b/src/main/java/cn/chjyj/szwh/utils/SzwhApiUtils.java index 678a4cb..415eb53 100644 --- a/src/main/java/cn/chjyj/szwh/utils/SzwhApiUtils.java +++ b/src/main/java/cn/chjyj/szwh/utils/SzwhApiUtils.java @@ -184,7 +184,7 @@ public class SzwhApiUtils { String url=tlangHost+"/consignation/v1/applylinkcode"; log.info("申请合约地址:"+url); // 使用的token - String sign=SignUtils.createSign("entrust"); + String sign=SignUtils.createSign("apply"); Map hmap = new HashMap(); hmap.put("cloudhub_token",sign); hmap.put("Content-Type","application/json"); diff --git a/src/main/resources/mapper/szwh/OrderUserMapper.xml b/src/main/resources/mapper/szwh/OrderUserMapper.xml index 1b03380..4324694 100644 --- a/src/main/resources/mapper/szwh/OrderUserMapper.xml +++ b/src/main/resources/mapper/szwh/OrderUserMapper.xml @@ -17,7 +17,7 @@ diff --git a/src/test/java/cn/chjyj/szwh/service/PayServiceTest.java b/src/test/java/cn/chjyj/szwh/service/PayServiceTest.java index 41fc545..7d39185 100644 --- a/src/test/java/cn/chjyj/szwh/service/PayServiceTest.java +++ b/src/test/java/cn/chjyj/szwh/service/PayServiceTest.java @@ -98,7 +98,8 @@ public class PayServiceTest { @Test public void paop(){ //String bac ="1678845209974478"; - String bac ="1678346098421910"; + // String bac ="1678346098421910"; + String bac ="1679984537058604"; payService.payFinishOperate(bac); }