From 8b9fd1fc33d08aa79e614ccd2c39240dfb7900ee Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 四月 2020 22:49:46 +0800
Subject: [PATCH] 优化采购申请
---
FrontService/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/FrontService/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java b/FrontService/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java
index f70dd56..c312727 100644
--- a/FrontService/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java
+++ b/FrontService/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java
@@ -69,7 +69,7 @@
* @return
* @throws Exception
*/
- protected Map<String, String> java110Payment(RestTemplate restTemplate,String feeName, String orderNum, double money, String openId) throws Exception {
+ protected Map<String, String> java110Payment(RestTemplate restTemplate,String feeName, String tradeType,String orderNum, double money, String openId) throws Exception {
logger.info("銆愬皬绋嬪簭鏀粯銆� 缁熶竴涓嬪崟寮�濮�, 璁㈠崟缂栧彿=" + orderNum);
SortedMap<String, String> resultMap = new TreeMap<String, String>();
//鐢熸垚鏀粯閲戦锛屽紑鍙戠幆澧冨鐞嗘敮浠橀噾棰濇暟鍒�0.01銆�0.02銆�0.03鍏�
@@ -77,14 +77,24 @@
double payAmount = PayUtil.getPayAmountByEnv(MappingCache.getValue("HC_ENV"), money);
//娣诲姞鎴栨洿鏂版敮浠樿褰�(鍙傛暟璺熻繘鑷繁涓氬姟闇�姹傛坊鍔�)
- Map<String, String> resMap = this.java110UnifieldOrder(restTemplate,feeName, orderNum, wechatAuthProperties.TRADE_TYPE_JSAPI, payAmount, openId);
+ Map<String, String> resMap = this.java110UnifieldOrder(restTemplate,feeName, orderNum, tradeType, payAmount, openId);
if ("SUCCESS".equals(resMap.get("return_code")) && "SUCCESS".equals(resMap.get("result_code"))) {
- resultMap.put("appId", wechatAuthProperties.getAppId());
- resultMap.put("timeStamp", PayUtil.getCurrentTimeStamp());
- resultMap.put("nonceStr", PayUtil.makeUUID(32));
- resultMap.put("package", "prepay_id=" + resMap.get("prepay_id"));
- resultMap.put("signType", "MD5");
- resultMap.put("sign", PayUtil.createSign(resultMap, wechatAuthProperties.getKey()));
+ if(WechatAuthProperties.TRADE_TYPE_JSAPI.equals(tradeType)) {
+ resultMap.put("appId", wechatAuthProperties.getAppId());
+ resultMap.put("timeStamp", PayUtil.getCurrentTimeStamp());
+ resultMap.put("nonceStr", PayUtil.makeUUID(32));
+ resultMap.put("package", "prepay_id=" + resMap.get("prepay_id"));
+ resultMap.put("signType", "MD5");
+ resultMap.put("sign", PayUtil.createSign(resultMap, wechatAuthProperties.getKey()));
+ }else if(WechatAuthProperties.TRADE_TYPE_APP.equals(tradeType)){
+ resultMap.put("appId", wechatAuthProperties.getAppId());
+ resultMap.put("timeStamp", PayUtil.getCurrentTimeStamp());
+ resultMap.put("nonceStr", PayUtil.makeUUID(32));
+ resultMap.put("partnerid", wechatAuthProperties.getMchId());
+ resultMap.put("prepayid", resMap.get("prepay_id"));
+ //resultMap.put("signType", "MD5");
+ resultMap.put("sign", PayUtil.createSign(resultMap, wechatAuthProperties.getKey()));
+ }
resultMap.put("code", "0");
resultMap.put("msg", "涓嬪崟鎴愬姛");
logger.info("銆愬皬绋嬪簭鏀粯銆戠粺涓�涓嬪崟鎴愬姛锛岃繑鍥炲弬鏁�:" + resultMap);
--
Gitblit v1.8.0