diff --git a/conf/szwh.properties b/conf/szwh.properties index 3430dae..1d3bc26 100644 --- a/conf/szwh.properties +++ b/conf/szwh.properties @@ -20,8 +20,10 @@ distribute.pem.token=4b4858543056374e564c4f4650533942 ENTRUST_URL = http://10.14.1.173:9528 # 交易系统地址 #TIANLANG_ENTRUST_URL =http://10.24.4.90:11030 -// 测试环境下的交易系统地址 +# 测试环境下的交易系统地址 TIANLANG_ENTRUST_URL = http://10.14.1.248:11030 +#TIANLANG_ENTRUST_URL = http://58.30.231.137:11030 + # 用户地址 #REAL_URL =http://10.24.4.14:51317 REAL_URL = http://10.14.1.190:51317 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 50a636a..dc1f7ec 100644 --- a/src/main/java/cn/chjyj/szwh/service/impl/PayServiceImpl.java +++ b/src/main/java/cn/chjyj/szwh/service/impl/PayServiceImpl.java @@ -72,8 +72,8 @@ public class PayServiceImpl implements PayService { if (order.getPayStatus() != 2) { // do nothing } - //订单状态 - Integer status = order.getStatus(); + //订单支付状态 + Integer status = order.getPayStatus(); Integer closeStatus = order.getCloseStatus(); Integer type = order.getType(); //查询购买用户 @@ -116,10 +116,12 @@ public class PayServiceImpl implements PayService { JSONObject aplinkCodeJson = SzwhApiUtils.getApplyLinkCode(odgd.getSourcedataIslicode(), buyIslicode, ratio, transCount, dateStr, batchcode); log.info("订单合约编号:" + aplinkCodeJson); - JSONArray aparr = aplinkCodeJson.getJSONArray("data"); - JSONObject lkcjson = (JSONObject) aparr.get(0); - // 返回的值是 buyIslicode 为键名的内容 - contractcode = lkcjson.getString(buyIslicode); + if(!aplinkCodeJson.isEmpty()) { //非空 + JSONArray aparr = aplinkCodeJson.getJSONArray("data"); + JSONObject lkcjson = (JSONObject) aparr.get(0); + // 返回的值是 buyIslicode 为键名的内容 + contractcode = lkcjson.getString(buyIslicode); + } } else { contractcode = odgd.getContractCode(); } @@ -182,6 +184,7 @@ public class PayServiceImpl implements PayService { JSONArray wsynarr = new JSONArray(syncList); //待同步过去的订单信息 String forsync = wsynarr.toJSONString(); + //同步订单信息 JSONObject outSyncJson = SzwhApiUtils.synchInfo(forsync); log.info(batchcode + "订单获取下载地址:" + outSyncJson); //返回链接地址 diff --git a/src/main/java/cn/chjyj/szwh/utils/SzwhApiUtils.java b/src/main/java/cn/chjyj/szwh/utils/SzwhApiUtils.java index 5cd48eb..2a21bac 100644 --- a/src/main/java/cn/chjyj/szwh/utils/SzwhApiUtils.java +++ b/src/main/java/cn/chjyj/szwh/utils/SzwhApiUtils.java @@ -177,6 +177,7 @@ public class SzwhApiUtils { String channelUser=ProperUtils.getSzwhProp("CHANNEL_ISLI"); String tlangHost= ProperUtils.getSzwhProp("TIANLANG_ENTRUST_URL"); //todo v2:测试环境 v1:正式环境 + //目标为买方 String url=tlangHost+"/consignation/v1/applylinkcode"; log.info("申请合约地址:"+url); // 使用的token @@ -185,6 +186,7 @@ public class SzwhApiUtils { hmap.put("cloudhub_token",sign); hmap.put("Content-Type","application/json"); hmap.put("channel_isli_flag",channelUser); + log.info("合约主机头:"+hmap.toString()); // 发送参数 Map postMap = new HashMap(); postMap.put("contractISLIFlag",goodsIsli); diff --git a/src/main/resources/mapper/szwh/OrderGoodsDetailMapper.xml b/src/main/resources/mapper/szwh/OrderGoodsDetailMapper.xml index 0202098..6a5ed61 100644 --- a/src/main/resources/mapper/szwh/OrderGoodsDetailMapper.xml +++ b/src/main/resources/mapper/szwh/OrderGoodsDetailMapper.xml @@ -38,7 +38,19 @@