From dcf2ab195388f3292096bbd421f9ee7e923b7c9e Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Mon, 24 Jan 2022 16:41:26 +0800 Subject: [PATCH] adding install cart verification --- .../smartadmin/common/domain/ResponseDTO.java | 3 ++ .../royalcanin/good/OrderController.java | 8 +++-- .../royalcanin/good/model/OrdersEntity.java | 2 +- .../module/system/wxpay/MyConfig.java | 22 ++++++++------ .../module/system/wxpay/WxpayService.java | 1 + .../resources/wxpay/pro/apiclient_cert.p12 | Bin 0 -> 2710 bytes .../resources/wxpay/pro/apiclient_cert.pem | 23 ++++++++++++++ .../resources/wxpay/pro/apiclient_key.pem | 28 ++++++++++++++++++ 8 files changed, 74 insertions(+), 13 deletions(-) create mode 100644 smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/apiclient_cert.p12 create mode 100644 smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/apiclient_cert.pem create mode 100644 smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/apiclient_key.pem diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/ResponseDTO.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/ResponseDTO.java index 92ec781e..4072e5d0 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/ResponseDTO.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/ResponseDTO.java @@ -44,6 +44,7 @@ public class ResponseDTO { this.success = responseCodeConst.isSuccess(); } + private ResponseDTO(ResponseCodeConst responseCodeConst) { this.code = responseCodeConst.getCode(); this.msg = responseCodeConst.getMsg(); @@ -64,6 +65,8 @@ public class ResponseDTO { return new ResponseDTO(ResponseCodeConst.SUCCESS, data, msg); } + + public static ResponseDTO succData(T data) { return new ResponseDTO(ResponseCodeConst.SUCCESS, data); } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java index 25731848..7b3b2e4b 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java @@ -54,7 +54,7 @@ public class OrderController { @ApiOperation(value = "微信支付订单", notes = "生成订单") @PostMapping("royalcanin/generateOrderWX") - public ResponseDTO generateOrderWX(@RequestBody List ordersEntityList) throws Exception { + public ResponseDTO> generateOrderWX(@RequestBody List ordersEntityList) throws Exception { StringBuffer productId = new StringBuffer(); StringBuffer productName = new StringBuffer(); String memberId = ""; @@ -112,7 +112,10 @@ public class OrderController { wxPayEntity.setProduct_id(ordersEntity.getProductCode()); wxPayEntity.setTotal_fee(StringUtil.toString(total_fee)); wxPayEntity.setOut_trade_no(ordersEntity.getOrderNo()); - return ResponseDTO.succData(ordersEntity.getOrderNo(),wxpayService.generateQRCode(wxPayEntity)); + Map returnMap = new HashMap<>(); + returnMap.put("orderNumber",ordersEntity.getOrderNo()); + returnMap.put("orderAmount",ordersEntity.getOrderAmount()); + return ResponseDTO.succData(returnMap,wxpayService.generateQRCode(wxPayEntity)); } return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_ORDER_FAIL); } @@ -171,7 +174,6 @@ public class OrderController { ordersEntity.setBuyCount(buyCount); ordersEntity.setOrderNo(GenerateSequenceUtil.generateSequenceNo()); ordersEntity.setOrderStatus("0"); - if(orderService.generateOrder(ordersEntity,orderDatilListJson) == 1){ wxPayEntity.setProduct_id(ordersEntity.getProductCode()); wxPayEntity.setTotal_fee(StringUtil.toString(total_fee)); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/OrdersEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/OrdersEntity.java index 787d0641..e569a25c 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/OrdersEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/OrdersEntity.java @@ -41,6 +41,6 @@ public class OrdersEntity { private OrderAddress orderAddress; - private Double basePoint; + private Double basePoint = 0.0; } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java index 94d897f6..3f0bcb86 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java @@ -11,8 +11,8 @@ import java.io.*; @Component public class MyConfig implements WXPayConfig { -// private String path ="C:/Users/Administrator/IdeaProjects/smart-admin/smart-admin-service/smart-admin-api/src/main/resources/wxpay/"; - private String path ="/home/royalcanin-dev/cert/"; +// private String path ="C:/Users/Administrator/IdeaProjects/smart-admin/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/"; + private String path ="/home/royalcanin-dev/cert/pro/"; // public String notify_url = "http://47.96.75.242:10086/smart-admin-api/royalcanin/updateOrderWX"; @@ -34,18 +34,22 @@ public class MyConfig implements WXPayConfig { certStream.close(); } public String getAppID() { - return "wx3c51c14272f63a64"; + return "wxa9a0ae603bbe6ceb"; } - //wxa9a0ae603bbe6ceb + //wx3c51c14272f63a64 - public String getMchID() { - return "1315161001"; +// public String getMchID() { +// return "16717629989"; +// } + public String getMchID() { + return "1523977801"; } -// 16717629989 + //1315161001 + public String getKey() { - return "b69497999e8fd1f8f1f0a9591b24eb72"; + return "indexphpcorecertapicert201903200"; } - //indexphpcorecertapicert201903200 + //b69497999e8fd1f8f1f0a9591b24eb72 public InputStream getCertStream() { ByteArrayInputStream certBis = new ByteArrayInputStream(this.certData); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java index 8351a808..303d6bf2 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java @@ -1,6 +1,7 @@ package net.lab1024.smartadmin.module.system.wxpay; import com.alibaba.fastjson.JSONObject; +import com.aliyun.oss.internal.SignUtils; import net.lab1024.smartadmin.common.heartbeat.StringUtil; import net.lab1024.smartadmin.module.system.royalcanin.MemberAccountService; import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderEntity; diff --git a/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/apiclient_cert.p12 b/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/apiclient_cert.p12 new file mode 100644 index 0000000000000000000000000000000000000000..516e6745ce3aa34b693af615a7a1f40b927796c1 GIT binary patch literal 2710 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