From e758b96c2fcbccfc770e3ce85887519c4203f419 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 一月 2022 09:30:29 +0800
Subject: [PATCH] 完成云卓 全景 支付

---
 service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java b/service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java
index 0245a2c..66d9a36 100644
--- a/service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java
+++ b/service-api/src/main/java/com/java110/api/smo/payment/adapt/plutuspay/PlutusPayAdapt.java
@@ -20,7 +20,9 @@
 import com.java110.api.properties.WechatAuthProperties;
 import com.java110.api.smo.payment.adapt.IPayAdapt;
 import com.java110.core.factory.ChinaUmsFactory;
+import com.java110.core.factory.PlutusFactory;
 import com.java110.core.factory.WechatFactory;
+import com.java110.dto.owner.OwnerAppUserDto;
 import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.utils.cache.MappingCache;
 import com.java110.utils.constant.WechatConstant;
@@ -151,16 +153,19 @@
         paramMap.put("openId", openid);
         paramMap.put("sn", smallWeChatDto.getMchId()); // 瀵屽弸鍒嗛厤缁欎簩绾у晢鎴风殑鍟嗘埛鍙�
         paramMap.put("outTradeId", orderNum);
+        if(OwnerAppUserDto.APP_TYPE_WECHAT_MINA.equals(tradeType)){
+            paramMap.put("isMiniProgram", true);
+        }
         paramMap.put("tradeAmount", PayUtil.moneyToIntegerStr(payAmount));
         paramMap.put("payTypeId", "1003");
         paramMap.put("notifyUrl", notifyUrl + "?wId=" + WechatFactory.getWId(smallWeChatDto.getAppId()));
 
         logger.debug("璋冪敤鏀粯缁熶竴涓嬪崟鎺ュ彛" + paramMap.toJSONString());
 
-        String param = PlutusUtil.Encryption(paramMap.toJSONString());
+        String param = PlutusFactory.Encryption(paramMap.toJSONString());
         System.out.println(param);
 
-        String str = PlutusUtil.post(wechatAuthProperties.getWxPayUnifiedOrder(), param);
+        String str = PlutusFactory.post(wechatAuthProperties.getWxPayUnifiedOrder(), param);
         System.out.println(str);
 
         JSONObject json = JSON.parseObject(str);
@@ -169,13 +174,13 @@
         String content = json.getString("content");
 
         //楠岀
-        Boolean verify = PlutusUtil.verify256(content, Base64.decode(signature));
+        Boolean verify = PlutusFactory.verify256(content, Base64.decode(signature));
         //楠岀鎴愬姛
         if (!verify) {
             throw new IllegalArgumentException("鏀粯澶辫触绛惧悕澶辫触");
         }
             //瑙e瘑
-            byte[] bb = PlutusUtil.decrypt(Base64.decode(content), PlutusUtil.SECRET_KEY);
+            byte[] bb = PlutusFactory.decrypt(Base64.decode(content), PlutusFactory.SECRET_KEY);
             //鏈嶅姟鍣ㄨ繑鍥炲唴瀹�
             String paramOut =  new String(bb);
 

--
Gitblit v1.8.0