Merge branches 'develop' and 'feature/20220112_银行周周惠_wuping' of…

Merge branches 'develop' and 'feature/20220112_银行周周惠_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

order-application-service/pom.xml

@@ -147,7 +147,7 @@
         <dependency>
             <artifactId>assortment-data-manager</artifactId>
             <groupId>com.freemud.sdk.api.assortment</groupId>
-            <version>5.5.31-RELEASE</version>
+            <version>5.5.40-RELEASE</version>
         </dependency>
         <dependency>
             <groupId>cn.freemud.commons</groupId>
@@ -217,6 +217,17 @@
 <!--            <artifactId>open-store-open-platform-sdk</artifactId>-->
 <!--            <version>1.3.5-SNAPSHOT</version>-->
 <!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.github.wechatpay-apiv3</groupId>-->
+<!--            <artifactId>wechatpay-apache-httpclient</artifactId>-->
+<!--            <version>0.4.0</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.squareup.okhttp3</groupId>-->
+<!--            <artifactId>okhttp</artifactId>-->
+<!--            <version>3.6.0</version>-->
+<!--        </dependency>-->
+
         <dependency>
             <groupId>io.springfox</groupId>
             <artifactId>springfox-swagger2</artifactId>

order-application-service/src/main/java/cn/freemud/entities/vo/order/PaymentConfigVo.java

@@ -16,4 +16,13 @@ public class PaymentConfigVo {
     @NotEmpty(message = "商户号不能为空")
     private String partnerId;
 
+    @ApiModelProperty("门店号")
+    private String storeId;
+
+    /**
+     * 插件类型 1=爱心餐　2= 周周惠
+     */
+    @ApiModelProperty("插件类型 1=爱心餐 2= 周周惠")
+    private Integer plugInType;
+
 }

order-application-service/src/main/java/cn/freemud/entities/vo/order/PlugInParameter.java

@@ -5,8 +5,31 @@ import lombok.Data;
 @Data
 public class PlugInParameter {
 
+    /**---------------爱心捐插件参数-----------------*/
+
     private String mchCode;
 
     private String subMchCode;
 
+    /**---------------周周惠插件参数-----------------*/
+    /**
+     * 报名商户号
+     */
+    private String applyMchid;
+
+    /**
+     * 签名商户号
+     */
+    private String signMchid;
+
+    /**
+     * 报名的支付门店id
+     */
+    private String storeId;
+
+    /**
+     * HMAC-SHA256签名
+     */
+    private String sign;
+    /**--------------------------------*/
 }

order-application-service/src/main/java/cn/freemud/service/impl/OrderAdapterServiceImpl.java

@@ -384,13 +384,18 @@ public class OrderAdapterServiceImpl {
 
 
 
-    public BaseResponse<PlugInParameter> getPaymentConfig(PaymentConfigVo createOrderVo){
-        AssortmentCustomerInfoVo assortmentCustomerInfoVo = assortmentCustomerInfoManager.getCustomerInfoByObject(createOrderVo.getSessionId());
+    public BaseResponse<PlugInParameter> getPaymentConfig(PaymentConfigVo paymentConfigVo){
+        AssortmentCustomerInfoVo assortmentCustomerInfoVo = assortmentCustomerInfoManager.getCustomerInfoByObject(paymentConfigVo.getSessionId());
         if (assortmentCustomerInfoVo == null || StringUtils.isEmpty(assortmentCustomerInfoVo.getMemberId())) {
             return ResponseUtil.error(ResponseResult.NOT_LOGIN);
         }
+        //周周惠插件要返回参数
+        if(paymentConfigVo.getPlugInType() != null && paymentConfigVo.getPlugInType() == 2){
+            return ResponseUtil.success(payService.getPlugInParameter(paymentConfigVo.getPartnerId(),assortmentCustomerInfoVo.getWxAppId(),paymentConfigVo.getStoreId()));
+        }
+
         //1元插件要返回参数
-        return ResponseUtil.success(payService.getPaymentAuth(createOrderVo.getPartnerId(),assortmentCustomerInfoVo.getWxAppId()));
+        return ResponseUtil.success(payService.getPlugInParameter(paymentConfigVo.getPartnerId(),assortmentCustomerInfoVo.getWxAppId()));
 
     }
 

order-application-service/src/main/java/cn/freemud/service/impl/PayServiceImpl.java

@@ -41,10 +41,7 @@ import cn.freemud.service.thirdparty.ComPayClient;
 import cn.freemud.service.thirdparty.PaymentNewClient;
 import cn.freemud.service.thirdparty.SvcAppClient;
 import cn.freemud.service.thirdparty.SvcComPayClient;
-import cn.freemud.utils.AppLogUtil;
-import cn.freemud.utils.RedisUtil;
-import cn.freemud.utils.ResponseUtil;
-import cn.freemud.utils.ValidationCode;
+import cn.freemud.utils.*;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.freemud.api.assortment.datamanager.entity.db.*;
@@ -1280,14 +1277,50 @@ public class PayServiceImpl {
         }
     }
 
-    //1元捐插件需要参数
-    public PlugInParameter getPaymentAuth(String partnerId, String appId) {
+    /**
+     * 1元捐插件需要参数
+     */
+    public PlugInParameter getPlugInParameter(String partnerId, String appId) {
+        PlugInParameter plugInParameter = new PlugInParameter();
+        List<AssortmentOpenPlatformPartnerPaymentConfig> openPlatformPartnerPaymentConfigs = openPlatformPartnerPaymentConfigManager.queryPartnerPaymentConfigs(partnerId, appId);
+        if (CollectionUtils.isNotEmpty(openPlatformPartnerPaymentConfigs)) {
+            plugInParameter.setMchCode(openPlatformPartnerPaymentConfigs.get(0).getUnitMchId());
+            plugInParameter.setSubMchCode(openPlatformPartnerPaymentConfigs.get(0).getSubMchid());
+        }
+        return plugInParameter;
+    }
+
+    /**
+     * 周周惠插件需要参数
+     */
+    public PlugInParameter getPlugInParameter(String partnerId, String appId,String storeId) {
         PlugInParameter plugInParameter = new PlugInParameter();
-        List<AssortmentOpenPlatformPartnerPaymentConfig> openPlatformPartnerPaymentAuths = openPlatformPartnerPaymentConfigManager.queryPartnerPaymentConfigs(partnerId, appId);
-        if (CollectionUtils.isNotEmpty(openPlatformPartnerPaymentAuths)) {
-            plugInParameter.setMchCode(openPlatformPartnerPaymentAuths.get(0).getUnitMchId());
-            plugInParameter.setSubMchCode(openPlatformPartnerPaymentAuths.get(0).getSubMchid());
+        List<AssortmentOpenPlatformPartnerPaymentConfig> openPlatformPartnerPaymentConfigs = openPlatformPartnerPaymentConfigManager.queryPartnerPaymentConfigs(partnerId, appId);
+        if (CollectionUtils.isEmpty(openPlatformPartnerPaymentConfigs)) {
+            return plugInParameter;
+        }
+
+        AssortmentOpenPlatformPaymentStore assortmentOpenPlatformPaymentStore = openPlatformPartnerPaymentConfigManager.queryPlatformPaymentStore(openPlatformPartnerPaymentConfigs.get(0).getId().toString(), storeId);
+        if (assortmentOpenPlatformPaymentStore == null || assortmentOpenPlatformPaymentStore.getStatus() != 1) {
+            return plugInParameter;
+        }
+        AssortmentOpenPlatformPartnerPaymentAuth assortmentOpenPlatformPartnerPaymentAuth = openPlatformPartnerPaymentConfigManager.queryPartnerPaymentAuth(openPlatformPartnerPaymentConfigs.get(0).getAuthId());
+        if (assortmentOpenPlatformPartnerPaymentAuth == null) {
+            return plugInParameter;
         }
+
+        String applyMchid = assortmentOpenPlatformPartnerPaymentAuth.getSp_mchid();
+        String signMchid = openPlatformPartnerPaymentConfigs.get(0).getSubMchid();
+        String thirdStoreId = assortmentOpenPlatformPaymentStore.getThirdStoreId();
+        plugInParameter.setApplyMchid(applyMchid);
+        plugInParameter.setSignMchid(signMchid);
+        plugInParameter.setStoreId(thirdStoreId);
+
+        String message = "apply_mchid="+applyMchid+"&sign_mchid="+signMchid+"&store_id="+thirdStoreId;
+
+        String sign = HMacSHA256.encrypt(message,assortmentOpenPlatformPartnerPaymentAuth.getPrivate_key());
+        plugInParameter.setSign(sign);
+
         return plugInParameter;
     }
 

order-application-service/src/main/java/cn/freemud/utils/HMacSHA256.java

+package cn.freemud.utils;
+
+import javax.crypto.Mac;
+import javax.crypto.spec.SecretKeySpec;
+
+
+public class HMacSHA256 {
+
+
+    /**
+     * HMacSHA256 类型签名
+     * @param message 签名字符串
+     * @param secret 私钥
+     * @return 加密后字符串
+     */
+    public static String encrypt(String message, String secret) {
+        String hash = "";
+        try {
+            Mac sha256_HMAC = Mac.getInstance("HmacSHA256");
+            SecretKeySpec secret_key = new SecretKeySpec(secret.getBytes(), "HmacSHA256");
+            sha256_HMAC.init(secret_key);
+            byte[] bytes = sha256_HMAC.doFinal(message.getBytes());
+            hash = byteArrayToHexString(bytes);
+//            System.out.println(hash);
+        } catch (Exception e) {
+            System.out.println("Error HmacSHA256 ===========" + e.getMessage());
+        }
+        return hash;
+    }
+
+    /**
+     * 将加密后的字节数组转化成字符串
+     * @param b
+     * @return
+     */
+    private static String byteArrayToHexString(byte[] b) {
+        StringBuilder hs = new StringBuilder();
+        String stmp;
+        for (int n = 0; b != null && n < b.length; n++) {
+            stmp = Integer.toHexString(b[n] & 0XFF);
+            if (stmp.length() == 1)
+                hs.append('0');
+            hs.append(stmp);
+        }
+        return hs.toString().toLowerCase();
+    }
+
+    String buildMessage(String apply_mchid, String sign_mchid, String store_id) {
+        return "apply_mchid="+apply_mchid+"&sign_mchid="+sign_mchid+"&store_id="+store_id;
+    }
+
+}

order-application-service/src/main/java/cn/freemud/utils/RSAUtils.java

 package cn.freemud.utils;
 
+//import com.wechat.pay.contrib.apache.httpclient.WechatPayHttpClientBuilder;
+//import com.wechat.pay.contrib.apache.httpclient.auth.AutoUpdateCertificatesVerifier;
+//import com.wechat.pay.contrib.apache.httpclient.auth.PrivateKeySigner;
+//import com.wechat.pay.contrib.apache.httpclient.auth.WechatPay2Credentials;
+//import com.wechat.pay.contrib.apache.httpclient.auth.WechatPay2Validator;
+//import com.wechat.pay.contrib.apache.httpclient.util.PemUtil;
 import org.apache.commons.codec.binary.Base64;
+import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.tomcat.util.http.fileupload.IOUtils;
+import org.junit.After;
+import org.junit.Before;
 
 import javax.crypto.Cipher;
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.security.*;
 import java.security.interfaces.RSAPrivateKey;
@@ -15,6 +26,9 @@ import java.security.spec.X509EncodedKeySpec;
 import java.util.HashMap;
 import java.util.Map;
 
+//import java.security.Signature;
+//import java.util.Base64;
+
 public class RSAUtils {
 
     public static final String CHARSET = "UTF-8";
@@ -186,6 +200,87 @@ public class RSAUtils {
         return resultDatas;
     }
 
-
+//    String privateKey = "";
+//
+//    String mchId = "";
+//
+//    String mchSerialNo = "";
+//
+//    String apiV3Key = "";
+//
+//    CloseableHttpClient httpClient;
+//
+//    @Before
+//    public void setup() throws IOException {
+//        // 加载商户私钥（privateKey：私钥字符串）
+//        PrivateKey merchantPrivateKey = PemUtil
+//                .loadPrivateKey(new ByteArrayInputStream(privateKey.getBytes("utf-8")));
+//
+//        // 加载平台证书（mchId：商户号,mchSerialNo：商户证书序列号,apiV3Key：V3密钥）
+//        AutoUpdateCertificatesVerifier verifier = new AutoUpdateCertificatesVerifier(
+//                new WechatPay2Credentials(mchId, new PrivateKeySigner(mchSerialNo, merchantPrivateKey)),apiV3Key.getBytes("utf-8"));
+//
+//        // 初始化httpClient
+//        CloseableHttpClient httpClient = WechatPayHttpClientBuilder.create()
+//                .withMerchant(mchId, mchSerialNo, merchantPrivateKey)
+//                .withValidator(new WechatPay2Validator(verifier)).build();
+//    }
+//
+//    @After
+//    public void after() throws IOException {
+//        httpClient.close();
+//    }
+//
+//
+//
+//    String url = "https://api.mch.weixin.qq.com/v3/certificates";
+//
+//    // Authorization: <schema> <token>
+//// GET - getToken("GET", httpurl, "")
+//// POST - getToken("POST", httpurl, json)
+//    String schema = "WECHATPAY2-SHA256-RSA2048";
+//    HttpUrl httpurl = HttpUrl.parse(url);
+//
+//    String getToken(String method, HttpUrl url, String body) throws UnsupportedEncodingException, SignatureException, NoSuchAlgorithmException, InvalidKeyException {
+//        String nonceStr = "your nonce string";
+//        String yourMerchantId = "your nonce string";
+//        String yourCertificateSerialNo = "your nonce string";
+//
+//        long timestamp = System.currentTimeMillis() / 1000;
+//        String message = buildMessage(method, url, timestamp, nonceStr, body);
+//        String signature = sign(message.getBytes("utf-8"));
+//
+//        return "mchid=\"" + yourMerchantId + "\","
+//                + "nonce_str=\"" + nonceStr + "\","
+//                + "timestamp=\"" + timestamp + "\","
+//                + "serial_no=\"" + yourCertificateSerialNo + "\","
+//                + "signature=\"" + signature + "\"";
+//    }
+//
+//    String sign(byte[] message) throws NoSuchAlgorithmException, SignatureException, UnsupportedEncodingException, InvalidKeyException {
+//        PrivateKey yourPrivateKey = PemUtil
+//                .loadPrivateKey(new ByteArrayInputStream(privateKey.getBytes("utf-8")));
+//
+//        Signature sign = Signature.getInstance("SHA256withRSA");
+//        sign.initSign(yourPrivateKey);
+//        sign.update(message);
+//
+//        return java.util.Base64.getEncoder().encodeToString(sign.sign());
+//
+//
+//    }
+//
+//    String buildMessage(String method, HttpUrl url, long timestamp, String nonceStr, String body) {
+//        String canonicalUrl = url.encodedPath();
+//        if (url.encodedQuery() != null) {
+//            canonicalUrl += "?" + url.encodedQuery();
+//        }
+//
+//        return method + "\n"
+//                + canonicalUrl + "\n"
+//                + timestamp + "\n"
+//                + nonceStr + "\n"
+//                + body + "\n";
+//    }
 
 }
\ No newline at end of file