From c3b5bbea29386128bb09da0978fb70da0b5dce39 Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期六, 13 三月 2021 17:31:10 +0800
Subject: [PATCH] 1、优化发布广告2、优化字母车位3、优化小区联系方式
---
service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java | 107 +++++++++++------------------------------------------
1 files changed, 23 insertions(+), 84 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java b/service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java
index c312727..4822203 100644
--- a/service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java
+++ b/service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java
@@ -1,21 +1,20 @@
package com.java110.front.smo;
-import com.java110.front.properties.WechatAuthProperties;
import com.java110.core.component.AbstractComponentSMO;
import com.java110.core.context.IPageData;
+import com.java110.core.factory.WechatFactory;
+import com.java110.dto.smallWeChat.SmallWeChatDto;
+import com.java110.front.properties.WechatAuthProperties;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.CommonConstant;
+import com.java110.utils.constant.WechatConstant;
import com.java110.utils.util.Assert;
import com.java110.utils.util.PayUtil;
import com.java110.utils.util.StringUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.http.*;
import org.springframework.web.client.HttpStatusCodeException;
import org.springframework.web.client.RestTemplate;
@@ -26,8 +25,24 @@
public abstract class AppAbstractComponentSMO extends AbstractComponentSMO {
private static final Logger logger = LoggerFactory.getLogger(AppAbstractComponentSMO.class);
+ protected static final String DEFAULT_PAY_ADAPT = "wechatPayAdapt";// 榛樿寰俊閫氱敤鏀粯
@Autowired
private WechatAuthProperties wechatAuthProperties;
+
+ @Autowired
+ private RestTemplate restTemplate;
+
+ //寰俊鏀粯
+ public static final String DOMAIN_WECHAT_PAY = "WECHAT_PAY";
+ // 寰俊鏈嶅姟鍟嗘敮浠樺紑鍏�
+ public static final String WECHAT_SERVICE_PAY_SWITCH = "WECHAT_SERVICE_PAY_SWITCH";
+ //寮�鍏砄N鎵撳紑
+ public static final String WECHAT_SERVICE_PAY_SWITCH_ON = "ON";
+
+ private static final String WECHAT_SERVICE_APP_ID = "SERVICE_APP_ID";
+
+ private static final String WECHAT_SERVICE_MCH_ID = "SERVICE_MCH_ID";
+
/**
* 璋冪敤涓績鏈嶅姟
@@ -45,12 +60,13 @@
header.add(CommonConstant.HTTP_TRANSACTION_ID.toLowerCase(), pd.getTransactionId());
header.add(CommonConstant.HTTP_REQ_TIME.toLowerCase(), pd.getRequestTime());
header.add(CommonConstant.HTTP_SIGN.toLowerCase(), "");
+ header.add("content-type", "application/json");
HttpEntity<String> httpEntity = new HttpEntity<String>(param, header);
//logger.debug("璇锋眰涓績鏈嶅姟淇℃伅锛寋}", httpEntity);
try {
responseEntity = restTemplate.exchange(url, httpMethod, httpEntity, String.class);
} catch (HttpStatusCodeException e) { //杩欓噷spring 妗嗘灦 鍦�4XX 鎴� 5XX 鏃舵姏鍑� HttpServerErrorException 寮傚父锛岄渶瑕侀噸鏂板皝瑁呬竴涓�
- responseEntity = new ResponseEntity<String>( e.getResponseBodyAsString(), e.getStatusCode());
+ responseEntity = new ResponseEntity<String>(e.getResponseBodyAsString(), e.getStatusCode());
} catch (Exception e) {
responseEntity = new ResponseEntity<String>(e.getMessage(), HttpStatus.INTERNAL_SERVER_ERROR);
} finally {
@@ -60,83 +76,6 @@
}
- /**
- * 棰勪笅鍗�
- *
- * @param orderNum
- * @param money
- * @param openId
- * @return
- * @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鍏�
- double payAmount = PayUtil.getPayAmountByEnv(MappingCache.getValue("HC_ENV"), money);
-//娣诲姞鎴栨洿鏂版敮浠樿褰�(鍙傛暟璺熻繘鑷繁涓氬姟闇�姹傛坊鍔�)
-
- 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"))) {
- 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);
- } 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(RestTemplate restTemplate, 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