Commit 9403589c4f9c1088e90f0b4ae86a3afca205bc14
1 parent
007e7d09
第一版
Showing
4 changed files
with
19 additions
and
91 deletions
zhyx-api/src/main/java/com/ectrip/cyt/client/cyt/model/cytOrder/response/CreateOrderResponseBody.java
... | ... | @@ -23,6 +23,22 @@ public class CreateOrderResponseBody extends ResponseBody { |
23 | 23 | @XmlType(name = "", propOrder = {"partnerorderId","partnerOrderId","otaOrderId","orderStatus","qrCodeStr","qrCodeUrl","onlyQrCodeUrl","verifyCode"}) |
24 | 24 | @Data |
25 | 25 | public static class OrderInfo { |
26 | + public String getPartnerorderId() { | |
27 | + return partnerorderId; | |
28 | + } | |
29 | + | |
30 | + public void setPartnerorderId(String partnerorderId) { | |
31 | + this.partnerorderId = partnerorderId; | |
32 | + } | |
33 | + | |
34 | + public String getPartnerOrderId() { | |
35 | + return partnerOrderId; | |
36 | + } | |
37 | + | |
38 | + public void setPartnerOrderId(String partnerOrderId) { | |
39 | + this.partnerOrderId = partnerOrderId; | |
40 | + } | |
41 | + | |
26 | 42 | @XmlElement(required = true) |
27 | 43 | protected String partnerorderId; |
28 | 44 | @XmlElement(required = true) | ... | ... |
zhyx-api/src/main/java/com/ectrip/cyt/client/cyt/service/TdosApiClient.java
... | ... | @@ -518,11 +518,11 @@ public class TdosApiClient{ |
518 | 518 | |
519 | 519 | String requestData; |
520 | 520 | if(securityType.equals(OtaUtils.SECURITY_MD5)){ |
521 | - String responseSigned = EncryptUtil.MD5Hex(key + requestXml).toUpperCase(); | |
522 | - requestJSON.put(OtaUtils.JSON_SIGNED, responseSigned); | |
523 | - | |
524 | 521 | byte[] requestByte = requestXml.getBytes(Charset.forName(OtaUtils.ENCODE_UTF8)); |
525 | 522 | requestData = Base64Utils.encode(requestByte); |
523 | + | |
524 | + String responseSigned = EncryptUtil.MD5Hex(key + requestData).toUpperCase(); | |
525 | + requestJSON.put(OtaUtils.JSON_SIGNED, responseSigned); | |
526 | 526 | }else{ |
527 | 527 | String iv = SecurityTools.generatorIv(); |
528 | 528 | if(securityType.equals(OtaUtils.SECURITY_AES_CBC)){ | ... | ... |
zhyx-api/src/main/java/com/ectrip/cyt/controller/TdosApiController.java
... | ... | @@ -474,92 +474,4 @@ public class TdosApiController { |
474 | 474 | } |
475 | 475 | return ajaxResult; |
476 | 476 | } |
477 | - | |
478 | - @ApiOperation(value = "批量下单测试接口",notes = "批量下单测试接口") | |
479 | - @ResponseBody | |
480 | - @PostMapping("/testCreateOrders") | |
481 | - public Object testCreateOrders() { | |
482 | - JSONObject returnJson=new JSONObject(); | |
483 | - String otaCode = UUIDTools.get16UUID(); | |
484 | - returnJson.put("ota订单号",otaCode); | |
485 | - CreateOrderRequest request=new CreateOrderRequest(); | |
486 | - CreateOrderParam createOrder=new CreateOrderParam(); | |
487 | - createOrder.setOrderCode(otaCode); | |
488 | - createOrder.setVisitDate(DateUtils.formatDate(DateUtils.today())); | |
489 | - | |
490 | - ProductParam productParam=new ProductParam(); | |
491 | - productParam.setProductNo("21"); | |
492 | - productParam.setSellPrice(0.01); | |
493 | - createOrder.setProduct(productParam); | |
494 | - | |
495 | - createOrder.setOrderQuantity(2); | |
496 | - createOrder.setOrderPrice(createOrder.getOrderQuantity()*productParam.getSellPrice()); | |
497 | - | |
498 | - Person person=new Person(); | |
499 | - person.setName("测试A"); | |
500 | - person.setCredentialsType(0); | |
501 | - person.setCredentials("445222199608083833"); | |
502 | - person.setPhone("15622980172"); | |
503 | - | |
504 | - Person personB=new Person(); | |
505 | - personB.setName("测试B"); | |
506 | - personB.setCredentialsType(0); | |
507 | - personB.setCredentials("110101199003070476"); | |
508 | - personB.setPhone("15622980172"); | |
509 | - | |
510 | - List<Person> persons=new ArrayList<Person>(); | |
511 | - persons.add(person); | |
512 | - persons.add(personB); | |
513 | - | |
514 | - createOrder.setContactPerson(person); | |
515 | - createOrder.setVisitPersons(persons); | |
516 | - | |
517 | - AccountParam account=new AccountParam(); | |
518 | - account.setDistributorName("binFxs"); | |
519 | - account.setIdentity(""); | |
520 | - account.setKey("12345678"); | |
521 | - account.setUrl("http://127.0.0.1:8080/service_/distributor_.do"); | |
522 | - | |
523 | - request.setCreateOrder(createOrder); | |
524 | - request.setAccount(account); | |
525 | - | |
526 | - | |
527 | - AjaxResult ajaxResult = new AjaxResult(); | |
528 | - ajaxResult.setSuccess(false); | |
529 | - | |
530 | - String cytCode=""; | |
531 | - | |
532 | - try { | |
533 | - Result result=TdosApiClient.createPaymentOrder(request.getCreateOrder(),request.getAccount()); | |
534 | - if(result.isSuccess()) { | |
535 | - CommonReturn commonReturn=(CommonReturn)result.getData(); | |
536 | - cytCode= commonReturn.getCytOrderCode(); | |
537 | - returnJson.put("畅游通订单号",cytCode); | |
538 | - returnJson.put("下单",commonReturn); | |
539 | - }else{ | |
540 | - return "下单接口联通失败,错误原因:"+result.getDescription(); | |
541 | - } | |
542 | - } catch (Exception e) { | |
543 | - e.printStackTrace(); | |
544 | - return"下单接口联通异常!"+e.getMessage(); | |
545 | - } | |
546 | - | |
547 | - /*PayOrderParam payOrderParam=new PayOrderParam(); | |
548 | - payOrderParam.setCytOrderCode(cytCode); | |
549 | - payOrderParam.setOrderPrice(createOrder.getOrderQuantity()*productParam.getSellPrice()); | |
550 | - | |
551 | - try { | |
552 | - Result result=TdosApiClient.payOrder(payOrderParam,request.getAccount()); | |
553 | - if(result.isSuccess()) { | |
554 | - CommonReturn commonReturn=(CommonReturn)result.getData(); | |
555 | - returnJson.put("支付",commonReturn); | |
556 | - }else{ | |
557 | - return "支付接口联通失败,错误原因:"+result.getDescription(); | |
558 | - } | |
559 | - } catch (Exception e) { | |
560 | - e.printStackTrace(); | |
561 | - return"支付接口联通异常!"+e.getMessage(); | |
562 | - }*/ | |
563 | - return returnJson; | |
564 | - } | |
565 | 477 | } | ... | ... |
zhyx-api/target/classes/com/ectrip/cyt/client/cyt/service/TdosApiClient.class
No preview for this file type