From e6c0063bc3df1984466a4295e83690f506f5c28e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期一, 27 一月 2020 19:04:47 +0800
Subject: [PATCH] 加入 临时车缴费功能

---
 AppFrontService/src/main/java/com/java110/app/smo/payment/impl/ToPaySMOImpl.java |  120 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/AppFrontService/src/main/java/com/java110/app/smo/payment/impl/ToPaySMOImpl.java b/AppFrontService/src/main/java/com/java110/app/smo/payment/impl/ToPaySMOImpl.java
index 2d66d2c..452a297 100644
--- a/AppFrontService/src/main/java/com/java110/app/smo/payment/impl/ToPaySMOImpl.java
+++ b/AppFrontService/src/main/java/com/java110/app/smo/payment/impl/ToPaySMOImpl.java
@@ -87,7 +87,7 @@
         String openId = realUserInfo.getString("openId");
 
         //寰俊涓嬪崟PayUtil
-        Map result = java110Payment(paramIn.getString("feeName"), orderId, money, openId);
+        Map result = super.java110Payment(restTemplate,paramIn.getString("feeName"), orderId, money, openId);
         responseEntity = new ResponseEntity(JSONObject.toJSONString(result), HttpStatus.OK);
 
         return responseEntity;
@@ -103,63 +103,63 @@
      * @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());
-    }
+//    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