| @@ -47,7 +47,8 @@ public class TtWebOrderServiceImpl implements TtWebOrderService { | |||||
| @Override | @Override | ||||
| public TtPayOrderQueryV2Result queryOrderV2(TtPayOrderQueryV2Request request) throws WxErrorException { | public TtPayOrderQueryV2Result queryOrderV2(TtPayOrderQueryV2Request request) throws WxErrorException { | ||||
| final TtWebPostRequestExecutor executor = new TtWebPostRequestExecutor(this.service.getRequestHttp()); | final TtWebPostRequestExecutor executor = new TtWebPostRequestExecutor(this.service.getRequestHttp()); | ||||
| String result = this.service.execute(executor, this.QUERY_ORDER, GSON.toJson(request)); | |||||
| String apiUrl = this.service.getTtWebConfig().getApiBegin().getPrefix() + this.QUERY_ORDER; | |||||
| String result = this.service.execute(executor, apiUrl, GSON.toJson(request)); | |||||
| return GSON.fromJson(result, TtPayOrderQueryV2Result.class); | return GSON.fromJson(result, TtPayOrderQueryV2Result.class); | ||||
| } | } | ||||
| @@ -57,14 +58,17 @@ public class TtWebOrderServiceImpl implements TtWebOrderService { | |||||
| TtPayOrderQueryV2Request request = new TtPayOrderQueryV2Request(); | TtPayOrderQueryV2Request request = new TtPayOrderQueryV2Request(); | ||||
| request.setOutOrderNo(StringUtils.trimToNull(outOrderNo)); | request.setOutOrderNo(StringUtils.trimToNull(outOrderNo)); | ||||
| request.setOrderId(StringUtils.trimToNull(orderId)); | request.setOrderId(StringUtils.trimToNull(orderId)); | ||||
| String result = this.service.execute(executor, this.QUERY_CPS, GSON.toJson(request)); | |||||
| String apiUrl = this.service.getTtWebConfig().getApiBegin().getPrefix() + this.QUERY_CPS; | |||||
| String result = this.service.execute(executor, apiUrl, GSON.toJson(request)); | |||||
| return GSON.fromJson(result, TtPayCpsOrderQueryV2Result.class); | return GSON.fromJson(result, TtPayCpsOrderQueryV2Result.class); | ||||
| } | } | ||||
| @Override | @Override | ||||
| public boolean pushDelivery(TtOrderPushDeliveryRequest request) throws WxErrorException { | public boolean pushDelivery(TtOrderPushDeliveryRequest request) throws WxErrorException { | ||||
| final TtWebPostRequestExecutor executor = new TtWebPostRequestExecutor(this.service.getRequestHttp()); | final TtWebPostRequestExecutor executor = new TtWebPostRequestExecutor(this.service.getRequestHttp()); | ||||
| String result = this.service.execute(executor, this.PUSH_DELIVERY, GSON.toJson(request)); | |||||
| String apiUrl = this.service.getTtWebConfig().getApiBegin().getPrefix() + this.PUSH_DELIVERY; | |||||
| String result = this.service.execute(executor, apiUrl, GSON.toJson(request)); | |||||
| return true; | return true; | ||||
| } | } | ||||
| } | } | ||||
| @@ -35,21 +35,24 @@ public class TtWebRefundServiceImpl implements TtWebRefundService { | |||||
| @Override | @Override | ||||
| public TtPayRefundV2Result refundV2(TtPayRefundV2Request request) throws WxErrorException { | public TtPayRefundV2Result refundV2(TtPayRefundV2Request request) throws WxErrorException { | ||||
| final TtWebPostRequestExecutor executor = new TtWebPostRequestExecutor(this.service.getRequestHttp()); | final TtWebPostRequestExecutor executor = new TtWebPostRequestExecutor(this.service.getRequestHttp()); | ||||
| String result = this.service.execute(executor, this.CREATE_REFUND, GSON.toJson(request)); | |||||
| String apiUrl = this.service.getTtWebConfig().getApiBegin().getPrefix() + this.CREATE_REFUND; | |||||
| String result = this.service.execute(executor, apiUrl, GSON.toJson(request)); | |||||
| return GSON.fromJson(result, TtPayRefundV2Result.class); | return GSON.fromJson(result, TtPayRefundV2Result.class); | ||||
| } | } | ||||
| @Override | @Override | ||||
| public boolean merchantAuditCallback(TtRefundAuditMsgRequest request) throws WxErrorException { | public boolean merchantAuditCallback(TtRefundAuditMsgRequest request) throws WxErrorException { | ||||
| final TtWebPostRequestExecutor executor = new TtWebPostRequestExecutor(this.service.getRequestHttp()); | final TtWebPostRequestExecutor executor = new TtWebPostRequestExecutor(this.service.getRequestHttp()); | ||||
| String result = this.service.execute(executor, this.MERCHANT_AUDIT_CALLBACK, GSON.toJson(request)); | |||||
| String apiUrl = this.service.getTtWebConfig().getApiBegin().getPrefix() + this.MERCHANT_AUDIT_CALLBACK; | |||||
| String result = this.service.execute(executor, apiUrl, GSON.toJson(request)); | |||||
| return true; | return true; | ||||
| } | } | ||||
| @Override | @Override | ||||
| public TtPayRefundQueryV2Result refundQueryV2(TtPayRefundQueryV2Request request) throws WxErrorException { | public TtPayRefundQueryV2Result refundQueryV2(TtPayRefundQueryV2Request request) throws WxErrorException { | ||||
| final TtWebPostRequestExecutor executor = new TtWebPostRequestExecutor(this.service.getRequestHttp()); | final TtWebPostRequestExecutor executor = new TtWebPostRequestExecutor(this.service.getRequestHttp()); | ||||
| String result = this.service.execute(executor, this.QUERY_REFUND, GSON.toJson(request)); | |||||
| String apiUrl = this.service.getTtWebConfig().getApiBegin().getPrefix() + this.QUERY_REFUND; | |||||
| String result = this.service.execute(executor, apiUrl, GSON.toJson(request)); | |||||
| return GSON.fromJson(result, TtPayRefundQueryV2Result.class); | return GSON.fromJson(result, TtPayRefundQueryV2Result.class); | ||||
| } | } | ||||
| } | } | ||||
| @@ -38,7 +38,8 @@ public class TtWebShareServiceImpl implements TtWebShareService { | |||||
| @Override | @Override | ||||
| public String profitSharing(ProfitSharingRequest request) throws WxErrorException { | public String profitSharing(ProfitSharingRequest request) throws WxErrorException { | ||||
| final TtWebPostRequestExecutor executor = new TtWebPostRequestExecutor(this.service.getRequestHttp()); | final TtWebPostRequestExecutor executor = new TtWebPostRequestExecutor(this.service.getRequestHttp()); | ||||
| String result = this.service.execute(executor, this.CREATE_SETTLE, GSON.toJson(request)); | |||||
| String apiUrl = this.service.getTtWebConfig().getApiBegin().getPrefix() + this.CREATE_SETTLE; | |||||
| String result = this.service.execute(executor, apiUrl, GSON.toJson(request)); | |||||
| JsonParser parser = new JsonParser(); | JsonParser parser = new JsonParser(); | ||||
| JsonObject jsonObject = parser.parse(result).getAsJsonObject(); | JsonObject jsonObject = parser.parse(result).getAsJsonObject(); | ||||
| return GsonHelper.getString(jsonObject,"settle_id"); | return GsonHelper.getString(jsonObject,"settle_id"); | ||||
| @@ -49,7 +50,8 @@ public class TtWebShareServiceImpl implements TtWebShareService { | |||||
| final TtWebPostRequestExecutor executor = new TtWebPostRequestExecutor(this.service.getRequestHttp()); | final TtWebPostRequestExecutor executor = new TtWebPostRequestExecutor(this.service.getRequestHttp()); | ||||
| JsonObject jsonObject = new JsonObject(); | JsonObject jsonObject = new JsonObject(); | ||||
| jsonObject.addProperty("out_settle_no",out_settle_no); | jsonObject.addProperty("out_settle_no",out_settle_no); | ||||
| String result = this.service.execute(executor, this.CREATE_SETTLE, jsonObject.toString()); | |||||
| String apiUrl = this.service.getTtWebConfig().getApiBegin().getPrefix() + this.QUERY_SETTLE; | |||||
| String result = this.service.execute(executor, apiUrl, jsonObject.toString()); | |||||
| List<TtSettleResult> list = GSON.fromJson(result, | List<TtSettleResult> list = GSON.fromJson(result, | ||||
| new TypeReference<List<TtSettleResult>>() {}.getType()); | new TypeReference<List<TtSettleResult>>() {}.getType()); | ||||
| return list; | return list; | ||||