From 56c31df5d6de12e9dab409b72761f187981fb715 Mon Sep 17 00:00:00 2001
From: 吴学文 <wuxuewen@wuxuewendeMacBook-Pro.local>
Date: 星期日, 26 四月 2020 23:09:48 +0800
Subject: [PATCH] 修复代码编译不过
---
FrontService/src/main/java/com/java110/front/smo/payment/impl/ToPaySMOImpl.java | 71 +----------------------------------
1 files changed, 2 insertions(+), 69 deletions(-)
diff --git a/FrontService/src/main/java/com/java110/front/smo/payment/impl/ToPaySMOImpl.java b/FrontService/src/main/java/com/java110/front/smo/payment/impl/ToPaySMOImpl.java
index 357ae04..f1afcd6 100644
--- a/FrontService/src/main/java/com/java110/front/smo/payment/impl/ToPaySMOImpl.java
+++ b/FrontService/src/main/java/com/java110/front/smo/payment/impl/ToPaySMOImpl.java
@@ -81,79 +81,12 @@
String openId = realUserInfo.getString("openId");
//寰俊涓嬪崟PayUtil
- Map result = super.java110Payment(restTemplate,paramIn.getString("feeName"), orderId, money, openId);
+ Map result = super.java110Payment(restTemplate,paramIn.getString("feeName"),paramIn.getString("tradeType"), orderId, money, openId);
responseEntity = new ResponseEntity(JSONObject.toJSONString(result), HttpStatus.OK);
return responseEntity;
}
- /**
- * 棰勪笅鍗�
- *
- * @param orderNum
- * @param money
- * @param openId
- * @return
- * @throws Exception
- */
-// private Map<String, String> java110Payment(String feeName, 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鍏�
-//
-// double payAmount = PayUtil.getPayAmountByEnv("DEV", money);
-////娣诲姞鎴栨洿鏂版敮浠樿褰�(鍙傛暟璺熻繘鑷繁涓氬姟闇�姹傛坊鍔�)
-//
-// Map<String, String> resMap = this.java110UnifieldOrder(feeName, orderNum, wechatAuthProperties.TRADE_TYPE_JSAPI, 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()));
-// resultMap.put("code", "0");
-// resultMap.put("msg", "涓嬪崟鎴愬姛");
-// logger.info("銆愬皬绋嬪簭鏀粯銆戠粺涓�涓嬪崟鎴愬姛锛岃繑鍥炲弬鏁�:" + resultMap);
-// } else {
-// resultMap.put("code", resMap.get("return_code"));
-// resultMap.put("msg", resMap.get("return_msg"));
-// logger.info("銆愬皬绋嬪簭鏀粯銆戠粺涓�涓嬪崟澶辫触锛屽け璐ュ師鍥�:" + resMap.get("return_msg"));
-// }
-// return resultMap;
-// }
-//
-// /**
-// * 灏忕▼搴忔敮浠樼粺涓�涓嬪崟
-// */
-// private Map<String, String> java110UnifieldOrder(String feeName, String orderNum, String tradeType, double payAmount, String openid) throws Exception {
-////灏佽鍙傛暟
-// SortedMap<String, String> paramMap = new TreeMap<String, String>();
-// paramMap.put("appid", wechatAuthProperties.getAppId());
-// paramMap.put("mch_id", wechatAuthProperties.getMchId());
-// paramMap.put("nonce_str", PayUtil.makeUUID(32));
-// paramMap.put("body", "HC鏅烘収瀹跺洯-" + feeName);
-// paramMap.put("out_trade_no", orderNum);
-// paramMap.put("total_fee", PayUtil.moneyToIntegerStr(payAmount));
-// paramMap.put("spbill_create_ip", PayUtil.getLocalIp());
-// paramMap.put("notify_url", wechatAuthProperties.getWxNotifyUrl());
-// paramMap.put("trade_type", tradeType);
-// paramMap.put("openid", openid);
-// paramMap.put("sign", PayUtil.createSign(paramMap, wechatAuthProperties.getKey()));
-////杞崲涓簒ml
-// String xmlData = PayUtil.mapToXml(paramMap);
-//
-// logger.debug("璋冪敤鏀粯缁熶竴涓嬪崟鎺ュ彛" + xmlData);
-//
-// ResponseEntity<String> responseEntity = restTemplate.postForEntity(
-// wechatAuthProperties.getWxPayUnifiedOrder(), xmlData, String.class);
-//
-// logger.debug("缁熶竴涓嬪崟杩斿洖" + responseEntity);
-////璇锋眰寰俊鍚庡彴锛岃幏鍙栭鏀粯ID
-// if (responseEntity.getStatusCode() != HttpStatus.OK) {
-// throw new IllegalArgumentException("鏀粯澶辫触" + responseEntity.getBody());
-// }
-// return PayUtil.xmlStrToMap(responseEntity.getBody());
-// }
+
}
--
Gitblit v1.8.0