!96 2022-1-24 Carl

Merge pull request !96 from Admin/sit-Carl-V3

smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/common/domain/ResponseDTO.java

@@ -44,6 +44,7 @@ public class ResponseDTO<T> {
         this.success = responseCodeConst.isSuccess();
     }
 
+
     private ResponseDTO(ResponseCodeConst responseCodeConst) {
         this.code = responseCodeConst.getCode();
         this.msg = responseCodeConst.getMsg();
@@ -64,6 +65,8 @@ public class ResponseDTO<T> {
         return new ResponseDTO(ResponseCodeConst.SUCCESS, data, msg);
     }
 
+
+
     public static <T> ResponseDTO<T> succData(T data) {
         return new ResponseDTO(ResponseCodeConst.SUCCESS, data);
     }

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<String> generateOrderWX(@RequestBody List<OrdersEntity> ordersEntityList) throws Exception {
+    public ResponseDTO<Map<String, String>> generateOrderWX(@RequestBody List<OrdersEntity> 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<String, String> 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));

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;
 
 }

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 ="C:/Users/Administrator/IdeaProjects/smart-admin/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/";
-    private String path ="/home/royalcanin-dev/cert/";
+    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 "16717629989";
+//    }
         public String getMchID() {
-        return "1315161001";
+        return "1523977801";
     }
-//    16717629989
+    //1315161001
+
     public String getKey() {
-        return "b69497999e8fd1f8f1f0a9591b24eb72";
+        return "indexphpcorecertapicert201903200";
     }
-    //indexphpcorecertapicert201903200
+    //b69497999e8fd1f8f1f0a9591b24eb72
 
     public InputStream getCertStream() {
         ByteArrayInputStream certBis = new ByteArrayInputStream(this.certData);

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;

smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/apiclient_cert.pem

@@ -0,0 +1,23 @@
+-----BEGIN CERTIFICATE-----
+MIID6TCCAtGgAwIBAgIUMO4qJG/XR9oQeHQphVQ7usz5/0YwDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjIwMTI0MDgxMTA3WhcNMjcwMTIzMDgxMTA3WjB7MRMwEQYDVQQDDAox
+NTIzOTc3ODAxMRswGQYDVQQKDBLlvq7kv6HllYbmiLfns7vnu58xJzAlBgNVBAsM
+HuS4iua1t+aHi+avheWVhui0uOaciemZkOWFrOWPuDELMAkGA1UEBgwCQ04xETAP
+BgNVBAcMCFNoZW5aaGVuMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+yRnwfm/9lHyq16cAJjx8/7x9WQF+/mKry6MvJIquaXUXBQKDO3d4deBLq8By7dXD
+xi7S7bPFeUkjXhgxs/WD15xyzNZj4qpKmXuEaFi0g1VLNUs3RmlWaR9OX0On+G2X
+vj4Zw1bi7sbefA1UrgNB7CH6nAaIVVWDdggxnUeX18F1y7BUBjPBh64Trbi0n011
+U/m738gyH37tfcSZCMM7aBO4/8BqRmRmNr58Owci8ee7G2yybGbRyVpT/3Y7cWLt
+k4pyOavIjpmaIo/CPbwMC5hOR4fxwyZUaTpyZh7foQFytz05UHvxp35hKZLnxI2d
+U+0wtymYYxTFGe6BngVHVwIDAQABo4GBMH8wCQYDVR0TBAIwADALBgNVHQ8EBAMC
+BPAwZQYDVR0fBF4wXDBaoFigVoZUaHR0cDovL2V2Y2EuaXRydXMuY29tLmNuL3B1
+YmxpYy9pdHJ1c2NybD9DQT0xQkQ0MjIwRTUwREJDMDRCMDZBRDM5NzU0OTg0NkMw
+MUMzRThFQkQyMA0GCSqGSIb3DQEBCwUAA4IBAQCOhr56rhhVqckEiN63f1JHD+SG
+4DRLCkcJ5oon2EvKOxCKFW9sqcggjtoF3R5ZQe8TwpGl/Pp7t0tbcpor9Gpr3V75
+fkkCsvotCaB3Hbpw/VzXP96848cQ8B/QtU+7oLCkCnakXeorgf/cLN/IlZ8ZAb5B
+R7ZEf8qthobPqAygrk1ZLmRNKzEMD+kWaFvffkYGeGP1chZPqevb4sS0BlckBaP/
+xeeU7R9Y5p5FANzIDCmHoFxqsrGLnF7Dh+bQSPSnG/rZjXnCYJFG6Jp/VvXP6enh
+5fpVimiUe/62aP6XkKLSm1sX9b86GuTaAl58n78oocNa/XBcKNJNa/3A37bW
+-----END CERTIFICATE-----

smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/apiclient_key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDJGfB+b/2UfKrX
+pwAmPHz/vH1ZAX7+YqvLoy8kiq5pdRcFAoM7d3h14EurwHLt1cPGLtLts8V5SSNe
+GDGz9YPXnHLM1mPiqkqZe4RoWLSDVUs1SzdGaVZpH05fQ6f4bZe+PhnDVuLuxt58
+DVSuA0HsIfqcBohVVYN2CDGdR5fXwXXLsFQGM8GHrhOtuLSfTXVT+bvfyDIffu19
+xJkIwztoE7j/wGpGZGY2vnw7ByLx57sbbLJsZtHJWlP/djtxYu2TinI5q8iOmZoi
+j8I9vAwLmE5Hh/HDJlRpOnJmHt+hAXK3PTlQe/GnfmEpkufEjZ1T7TC3KZhjFMUZ
+7oGeBUdXAgMBAAECggEBAKmjzA+cgRjlIWjRY3rdw8QnSMXwUSReL/WULoxwwDgN
+oeGEARgE7ATjtHGp4klm7cMcdKo33/k0DTWuyx63mQQk4WKR56ipZkyauVMcoQm4
+xbyrOnGXImGDGyWZePRD3qGI2UrC3KP39m5HAIvaC54Z+8HqcM8rV74Vo2S9pAVH
+mhdH9VC5tnp2cBnOh8UyhIYmqAj/SXSk5Becq2IoYG8r5vojvohtxL/w5hbEfBnz
+VhjZo82t0hhFGHfFJHw/3D2JjGdYI8QTxTZ78pMb0uK5XsJtxdQFKf5jS4XopJ5k
+2h/YtAHxFv6K1cqyAaS3ZoyYGTOWy+eQrycGm62nNqECgYEA6UMsK8t/eS4NE1rK
+capEufddSDzUr2C34ZLxZgXXOpLEdbvvADlCVqqT0/N682xxeM0iK+HVHRpmbzE9
+v0MKPeMuRJ14aoiQEdGhDwEWgkyZr3GGdkgsIxO3/x9TNBK4F9pxZPFLSvkNDscO
+75A2CBtB18gm6yAHkr+UQRlpXpsCgYEA3LQ4Tfme2xD6sa0WE+SFGk4hW/wfMawi
+C1v5xJEjmI2ucKw3i19fKT+3a1LHY47ytjNS0hRQUoEYO0iEe1wO9t1TExmreLar
+mUW4jcnoLEUBBYHfu6vTbyoRePUXhtk9jb2cFEMpDXI3qNwGN+2LTRz3Q1G8T+D9
+kdHHGLF+h/UCgYB1GH5dAcvdBiwUMjh8NNBJVo7iS38tBu1n9H7wCzCPO8wZmh0R
+TK0rmneZJ5nqBt8zmC52PujfsjgHy31GvR2wEZJRaYdgW2uPNl+Wi6JECLYBp4ir
+afGWLjjofk4jTt5RQxw3YxW77igK6gxqYEdvbFdyPgyjbbG/jiKbR2lozwKBgQCU
+PwXW8oYO1e/eqsm6oPP7AGIN/GMjpWDUynoR2//R99ElY7iHiI9OELtufpLpv9ou
+InlOHVD6qjYRlBtRFTwD/BRSLxrroZ/P+3IE44ttOQh/n4Yd9EO4VsSXv+GGtaNP
+8v3E6nvHyWGzrd8LcCbyrDM2Z8+axCDu8r7OSmMYhQKBgQDa3hTeI/sV72kH+8vz
+GaTbQBtuxI34sKOxdsp7vR2IfTJjOPhTHgxCnISUaHFvgnYpmNgSZbLBMasIWouz
+9NbU+lEwGBXKcNbCKQaWut7z3CArsV5j/9kKQrBwXWVsFNgKYwO0Md7aEKtcruLN
+WjetT3R9CLwHFB2H+K3Mi0+5JA==
+-----END PRIVATE KEY-----