From 9403589c4f9c1088e90f0b4ae86a3afca205bc14 Mon Sep 17 00:00:00 2001 From: wrb Date: Mon, 4 Mar 2024 17:42:38 +0800 Subject: [PATCH] 第一版 --- zhyx-api/src/main/java/com/ectrip/cyt/client/cyt/model/cytOrder/response/CreateOrderResponseBody.java | 16 ++++++++++++++++ zhyx-api/src/main/java/com/ectrip/cyt/client/cyt/service/TdosApiClient.java | 6 +++--- zhyx-api/src/main/java/com/ectrip/cyt/controller/TdosApiController.java | 88 ---------------------------------------------------------------------------------------- zhyx-api/target/classes/com/ectrip/cyt/client/cyt/service/TdosApiClient.class | Bin 32519 -> 0 bytes 4 files changed, 19 insertions(+), 91 deletions(-) diff --git a/zhyx-api/src/main/java/com/ectrip/cyt/client/cyt/model/cytOrder/response/CreateOrderResponseBody.java b/zhyx-api/src/main/java/com/ectrip/cyt/client/cyt/model/cytOrder/response/CreateOrderResponseBody.java index 843871b..9997bfd 100644 --- a/zhyx-api/src/main/java/com/ectrip/cyt/client/cyt/model/cytOrder/response/CreateOrderResponseBody.java +++ b/zhyx-api/src/main/java/com/ectrip/cyt/client/cyt/model/cytOrder/response/CreateOrderResponseBody.java @@ -23,6 +23,22 @@ public class CreateOrderResponseBody extends ResponseBody { @XmlType(name = "", propOrder = {"partnerorderId","partnerOrderId","otaOrderId","orderStatus","qrCodeStr","qrCodeUrl","onlyQrCodeUrl","verifyCode"}) @Data public static class OrderInfo { + public String getPartnerorderId() { + return partnerorderId; + } + + public void setPartnerorderId(String partnerorderId) { + this.partnerorderId = partnerorderId; + } + + public String getPartnerOrderId() { + return partnerOrderId; + } + + public void setPartnerOrderId(String partnerOrderId) { + this.partnerOrderId = partnerOrderId; + } + @XmlElement(required = true) protected String partnerorderId; @XmlElement(required = true) diff --git a/zhyx-api/src/main/java/com/ectrip/cyt/client/cyt/service/TdosApiClient.java b/zhyx-api/src/main/java/com/ectrip/cyt/client/cyt/service/TdosApiClient.java index 3776d31..6706bbd 100644 --- a/zhyx-api/src/main/java/com/ectrip/cyt/client/cyt/service/TdosApiClient.java +++ b/zhyx-api/src/main/java/com/ectrip/cyt/client/cyt/service/TdosApiClient.java @@ -518,11 +518,11 @@ public class TdosApiClient{ String requestData; if(securityType.equals(OtaUtils.SECURITY_MD5)){ - String responseSigned = EncryptUtil.MD5Hex(key + requestXml).toUpperCase(); - requestJSON.put(OtaUtils.JSON_SIGNED, responseSigned); - byte[] requestByte = requestXml.getBytes(Charset.forName(OtaUtils.ENCODE_UTF8)); requestData = Base64Utils.encode(requestByte); + + String responseSigned = EncryptUtil.MD5Hex(key + requestData).toUpperCase(); + requestJSON.put(OtaUtils.JSON_SIGNED, responseSigned); }else{ String iv = SecurityTools.generatorIv(); if(securityType.equals(OtaUtils.SECURITY_AES_CBC)){ diff --git a/zhyx-api/src/main/java/com/ectrip/cyt/controller/TdosApiController.java b/zhyx-api/src/main/java/com/ectrip/cyt/controller/TdosApiController.java index 9bb4698..5a181ca 100644 --- a/zhyx-api/src/main/java/com/ectrip/cyt/controller/TdosApiController.java +++ b/zhyx-api/src/main/java/com/ectrip/cyt/controller/TdosApiController.java @@ -474,92 +474,4 @@ public class TdosApiController { } return ajaxResult; } - - @ApiOperation(value = "批量下单测试接口",notes = "批量下单测试接口") - @ResponseBody - @PostMapping("/testCreateOrders") - public Object testCreateOrders() { - JSONObject returnJson=new JSONObject(); - String otaCode = UUIDTools.get16UUID(); - returnJson.put("ota订单号",otaCode); - CreateOrderRequest request=new CreateOrderRequest(); - CreateOrderParam createOrder=new CreateOrderParam(); - createOrder.setOrderCode(otaCode); - createOrder.setVisitDate(DateUtils.formatDate(DateUtils.today())); - - ProductParam productParam=new ProductParam(); - productParam.setProductNo("21"); - productParam.setSellPrice(0.01); - createOrder.setProduct(productParam); - - createOrder.setOrderQuantity(2); - createOrder.setOrderPrice(createOrder.getOrderQuantity()*productParam.getSellPrice()); - - Person person=new Person(); - person.setName("测试A"); - person.setCredentialsType(0); - person.setCredentials("445222199608083833"); - person.setPhone("15622980172"); - - Person personB=new Person(); - personB.setName("测试B"); - personB.setCredentialsType(0); - personB.setCredentials("110101199003070476"); - personB.setPhone("15622980172"); - - List persons=new ArrayList(); - persons.add(person); - persons.add(personB); - - createOrder.setContactPerson(person); - createOrder.setVisitPersons(persons); - - AccountParam account=new AccountParam(); - account.setDistributorName("binFxs"); - account.setIdentity(""); - account.setKey("12345678"); - account.setUrl("http://127.0.0.1:8080/service_/distributor_.do"); - - request.setCreateOrder(createOrder); - request.setAccount(account); - - - AjaxResult ajaxResult = new AjaxResult(); - ajaxResult.setSuccess(false); - - String cytCode=""; - - try { - Result result=TdosApiClient.createPaymentOrder(request.getCreateOrder(),request.getAccount()); - if(result.isSuccess()) { - CommonReturn commonReturn=(CommonReturn)result.getData(); - cytCode= commonReturn.getCytOrderCode(); - returnJson.put("畅游通订单号",cytCode); - returnJson.put("下单",commonReturn); - }else{ - return "下单接口联通失败,错误原因:"+result.getDescription(); - } - } catch (Exception e) { - e.printStackTrace(); - return"下单接口联通异常!"+e.getMessage(); - } - - /*PayOrderParam payOrderParam=new PayOrderParam(); - payOrderParam.setCytOrderCode(cytCode); - payOrderParam.setOrderPrice(createOrder.getOrderQuantity()*productParam.getSellPrice()); - - try { - Result result=TdosApiClient.payOrder(payOrderParam,request.getAccount()); - if(result.isSuccess()) { - CommonReturn commonReturn=(CommonReturn)result.getData(); - returnJson.put("支付",commonReturn); - }else{ - return "支付接口联通失败,错误原因:"+result.getDescription(); - } - } catch (Exception e) { - e.printStackTrace(); - return"支付接口联通异常!"+e.getMessage(); - }*/ - return returnJson; - } } diff --git a/zhyx-api/target/classes/com/ectrip/cyt/client/cyt/service/TdosApiClient.class b/zhyx-api/target/classes/com/ectrip/cyt/client/cyt/service/TdosApiClient.class index 6403454..3194734 100644 Binary files a/zhyx-api/target/classes/com/ectrip/cyt/client/cyt/service/TdosApiClient.class and b/zhyx-api/target/classes/com/ectrip/cyt/client/cyt/service/TdosApiClient.class differ -- libgit2 0.21.4