From 410ddd29a7ec603c5cf8c46b17e695b570125d23 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 11 一月 2022 07:26:24 +0800
Subject: [PATCH] 完成支付
---
service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarFeeSMOImpl.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarFeeSMOImpl.java b/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarFeeSMOImpl.java
index b50b170..9299988 100644
--- a/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarFeeSMOImpl.java
+++ b/service-api/src/main/java/com/java110/api/smo/payment/impl/ToPayTempCarFeeSMOImpl.java
@@ -9,10 +9,11 @@
import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
import com.java110.core.factory.GenerateCodeFactory;
-import com.java110.dto.app.AppDto;
import com.java110.dto.fee.FeeDto;
-import com.java110.dto.owner.OwnerAppUserDto;
+import com.java110.dto.ownerCarOpenUser.OwnerCarOpenUserDto;
import com.java110.dto.smallWeChat.SmallWeChatDto;
+import com.java110.intf.user.IOwnerCarOpenUserV1InnerServiceSMO;
+import com.java110.po.ownerCarOpenUser.OwnerCarOpenUserPo;
import com.java110.utils.cache.CommonCache;
import com.java110.utils.cache.MappingCache;
import com.java110.utils.constant.WechatConstant;
@@ -30,8 +31,6 @@
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
-import java.math.BigDecimal;
-import java.util.HashMap;
import java.util.Map;
@Service("toPayTempCarFeeSMOImpl")
@@ -48,6 +47,9 @@
@Autowired
private WechatAuthProperties wechatAuthProperties;
+
+ @Autowired
+ private IOwnerCarOpenUserV1InnerServiceSMO ownerCarOpenUserV1InnerServiceSMOImpl;
@Override
public ResponseEntity<String> toPay(IPageData pd) {
@@ -75,8 +77,8 @@
if (smallWeChatDto == null) { //浠庨厤缃枃浠朵腑鑾峰彇 灏忕▼搴忛厤缃俊鎭�
smallWeChatDto = new SmallWeChatDto();
- smallWeChatDto.setAppId(wechatAuthProperties.getAppId());
- smallWeChatDto.setAppSecret(wechatAuthProperties.getSecret());
+ smallWeChatDto.setAppId(wechatAuthProperties.getWechatAppId());
+ smallWeChatDto.setAppSecret(wechatAuthProperties.getWechatAppSecret());
smallWeChatDto.setMchId(wechatAuthProperties.getMchId());
smallWeChatDto.setPayPassword(wechatAuthProperties.getKey());
}
@@ -84,7 +86,7 @@
//鏌ヨ鐢ㄦ埛ID
paramIn.put("userId", pd.getUserId());
- String url = "/tempCarFee.getTempCarFeeOrder?paId=" + paramIn.getString("paId") + "&carNum=" + paramIn.getString("carNum");
+ String url = "tempCarFee.getTempCarFeeOrder?paId=" + paramIn.getString("paId") + "&carNum=" + paramIn.getString("carNum");
responseEntity = super.callCenterService(restTemplate, pd, "", url, HttpMethod.GET);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
@@ -97,7 +99,7 @@
JSONObject fee = orderInfo.getJSONObject("data");
double money = fee.getDouble("payCharge");
- String orderId = orderInfo.getString("oId");
+ String orderId = GenerateCodeFactory.getOId();
String openId = paramIn.getString("openId");
String payAdapt = MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, WechatConstant.PAY_ADAPT);
payAdapt = StringUtil.isEmpty(payAdapt) ? DEFAULT_PAY_ADAPT : payAdapt;
@@ -117,6 +119,16 @@
saveFees.put("payTime", DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
saveFees.put("payType", "2");
CommonCache.setValue(FeeDto.REDIS_PAY_TEMP_CAR_FEE + orderId, saveFees.toJSONString(), CommonCache.PAY_DEFAULT_EXPIRE_TIME);
+
+ //璁板綍openId 鍜岃溅杈嗗叧绯� 浠ュ厤姣忔 杈撳叆 杞︾墝鍙烽夯鐑�
+ OwnerCarOpenUserPo ownerCarOpenUserPo = new OwnerCarOpenUserPo();
+ ownerCarOpenUserPo.setCarNum(paramIn.getString("carNum"));
+ ownerCarOpenUserPo.setNickname("鏈幏鍙�");
+ ownerCarOpenUserPo.setHeadimgurl("涓鸿幏鍙�");
+ ownerCarOpenUserPo.setOpenId(openId);
+ ownerCarOpenUserPo.setOpenType(OwnerCarOpenUserDto.OPEN_TYPE_WECHAT);
+ ownerCarOpenUserPo.setOpenUserId(GenerateCodeFactory.getGeneratorId("10"));
+ ownerCarOpenUserV1InnerServiceSMOImpl.saveOwnerCarOpenUser(ownerCarOpenUserPo);
return responseEntity;
}
--
Gitblit v1.8.0