From 074caee550216dfd4bb676677ae33cbd837c5710 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期三, 27 八月 2025 18:17:21 +0800
Subject: [PATCH] 暂存0827
---
service-acct/src/main/java/com/java110/acct/payment/adapt/fuiou/FuiouPaymentFactoryAdapt.java | 90 ++++++++++++++++++++++++++++++++------------
1 files changed, 65 insertions(+), 25 deletions(-)
diff --git a/service-acct/src/main/java/com/java110/acct/payment/adapt/fuiou/FuiouPaymentFactoryAdapt.java b/service-acct/src/main/java/com/java110/acct/payment/adapt/fuiou/FuiouPaymentFactoryAdapt.java
index f7c6237..502ea32 100644
--- a/service-acct/src/main/java/com/java110/acct/payment/adapt/fuiou/FuiouPaymentFactoryAdapt.java
+++ b/service-acct/src/main/java/com/java110/acct/payment/adapt/fuiou/FuiouPaymentFactoryAdapt.java
@@ -10,7 +10,11 @@
import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.payment.NotifyPaymentOrderDto;
import com.java110.dto.payment.PaymentOrderDto;
+import com.java110.dto.payment.PaymentPoolDto;
+import com.java110.dto.payment.PaymentPoolValueDto;
import com.java110.dto.wechat.SmallWeChatDto;
+import com.java110.intf.acct.IPaymentPoolV1InnerServiceSMO;
+import com.java110.intf.acct.IPaymentPoolValueV1InnerServiceSMO;
import com.java110.intf.store.ISmallWechatV1InnerServiceSMO;
import com.java110.intf.user.IOwnerAppUserInnerServiceSMO;
import com.java110.utils.cache.MappingCache;
@@ -28,6 +32,7 @@
import java.util.Map;
import java.util.SortedMap;
import java.util.TreeMap;
+import java.util.stream.Collectors;
/**
* 瀵屽弸 鏀粯
@@ -93,6 +98,11 @@
@Autowired
private RestTemplate outRestTemplate;
+ @Autowired
+ private IPaymentPoolV1InnerServiceSMO paymentPoolV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IPaymentPoolValueV1InnerServiceSMO paymentPoolValueV1InnerServiceSMOImpl;
@Override
@@ -109,15 +119,16 @@
String openId = reqJson.getString("openId");
if(StringUtil.isEmpty(openId)) {
- String appType = OwnerAppUserDto.APP_TYPE_WECHAT_MINA;
- if (AppDto.WECHAT_OWNER_APP_ID.equals(appId)) {
- appType = OwnerAppUserDto.APP_TYPE_WECHAT;
- } else if (AppDto.WECHAT_MINA_OWNER_APP_ID.equals(appId)) {
- appType = OwnerAppUserDto.APP_TYPE_WECHAT_MINA;
- } else {
- appType = OwnerAppUserDto.APP_TYPE_APP;
- }
-
+ //鐢变簬鐜板湪鍙湁006锛屾墍浠ュ啓姝籛ECHAT锛屽悗缁鏋滄湁澶氱鏀粯鏂瑰紡鍒欓噸鏂拌璁�
+// String appType = OwnerAppUserDto.APP_TYPE_WECHAT_MINA;
+// if (AppDto.WECHAT_OWNER_APP_ID.equals(appId)) {
+// appType = OwnerAppUserDto.APP_TYPE_WECHAT;
+// } else if (AppDto.WECHAT_MINA_OWNER_APP_ID.equals(appId)) {
+// appType = OwnerAppUserDto.APP_TYPE_WECHAT_MINA;
+// } else {
+// appType = OwnerAppUserDto.APP_TYPE_APP;
+// }
+ String appType = OwnerAppUserDto.APP_TYPE_WECHAT;
OwnerAppUserDto ownerAppUserDto = new OwnerAppUserDto();
ownerAppUserDto.setUserId(userId);
ownerAppUserDto.setAppType(appType);
@@ -181,8 +192,8 @@
if (feeName.length() > 127) {
feeName = feeName.substring(0, 126);
}
- String orderPre = CommunitySettingFactory.getValue(smallWeChatDto.getObjId(), "FUIOU_ORDER_PRE");
-
+// String orderPre = CommunitySettingFactory.getValue(smallWeChatDto.getObjId(), "FUIOU_ORDER_PRE");
+ String orderPre = smallWeChatDto.getOrderPre();
JSONObject paramMap = new JSONObject();
paramMap.put("mchnt_cd", smallWeChatDto.getMchId()); // 瀵屽弸鍒嗛厤缁欎簩绾у晢鎴风殑鍟嗘埛鍙�
paramMap.put("order_type", "WECHAT");
@@ -285,24 +296,53 @@
private SmallWeChatDto getSmallWechat(JSONObject paramIn) {
+// SmallWeChatDto smallWeChatDto = new SmallWeChatDto();
+// smallWeChatDto.setObjId(paramIn.getString("communityId"));
+// smallWeChatDto.setAppId(paramIn.getString("appId"));
+// smallWeChatDto.setPage(1);
+// smallWeChatDto.setRow(1);
+// List<SmallWeChatDto> smallWeChatDtos = smallWechatV1InnerServiceSMOImpl.querySmallWechats(smallWeChatDto);
+
+// if (smallWeChatDtos == null || smallWeChatDtos.size() < 1) {
SmallWeChatDto smallWeChatDto = new SmallWeChatDto();
- smallWeChatDto.setObjId(paramIn.getString("communityId"));
- smallWeChatDto.setAppId(paramIn.getString("appId"));
- smallWeChatDto.setPage(1);
- smallWeChatDto.setRow(1);
- List<SmallWeChatDto> smallWeChatDtos = smallWechatV1InnerServiceSMOImpl.querySmallWechats(smallWeChatDto);
-
- if (smallWeChatDtos == null || smallWeChatDtos.size() < 1) {
- smallWeChatDto = new SmallWeChatDto();
+ //鐢变簬瀵屾湁鏀粯鏂瑰紡瑕佷粠鏁版嵁搴撻噷闈㈠彇鍊硷紝鎵�浠ユ澶勮鏌ヨ
+ PaymentPoolDto paymentPoolDto = new PaymentPoolDto();
+ paymentPoolDto.setCommunityId(paramIn.getString("communityId"));
+ paymentPoolDto.setPage(1);
+ paymentPoolDto.setRow(10);
+ List<PaymentPoolDto> paymentPoolDtos = paymentPoolV1InnerServiceSMOImpl.queryPaymentPools(paymentPoolDto);
+ List<PaymentPoolDto> collect = paymentPoolDtos.stream().filter(e -> e.getPaymentType().equals("FUIOU")).collect(Collectors.toList());
+ PaymentPoolValueDto paymentPoolValueDto = new PaymentPoolValueDto();
+ paymentPoolValueDto.setPpId(collect.get(0).getPpId());
+ paymentPoolValueDto.setCommunityId(paramIn.getString("communityId"));
+ List<PaymentPoolValueDto> values = paymentPoolValueV1InnerServiceSMOImpl.queryPaymentPoolValues(paymentPoolValueDto);
+ Map<String, List<PaymentPoolValueDto>> payMap = values.stream().collect(Collectors.groupingBy(PaymentPoolValueDto::getColumnKey));
+ if(payMap.containsKey("FUIOU_APP_ID")){
+ smallWeChatDto.setAppId(payMap.get("FUIOU_APP_ID").get(0).getColumnValue());
+ }else{
smallWeChatDto.setAppId(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appId"));
- smallWeChatDto.setAppSecret(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret"));
- smallWeChatDto.setMchId(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId"));
- smallWeChatDto.setPayPassword(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key"));
- smallWeChatDto.setObjId(paramIn.getString("communityId"));
- return smallWeChatDto;
}
+ if(payMap.containsKey("FUIOU_MCHNT_KEY")){
+ smallWeChatDto.setAppSecret(payMap.get("FUIOU_MCHNT_KEY").get(0).getColumnValue());
+ }else{
+ smallWeChatDto.setAppSecret(MappingCache.getValue(WechatConstant.WECHAT_DOMAIN, "appSecret"));
+ }
+ if(payMap.containsKey("FUIOU_MERCHANT_ID")){
+ smallWeChatDto.setMchId(payMap.get("FUIOU_MERCHANT_ID").get(0).getColumnValue());
+ }else{
+ smallWeChatDto.setMchId(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "mchId"));
+ }
+ if(payMap.containsKey("FUIOU_ORDER_PRE")){
+ smallWeChatDto.setOrderPre(payMap.get("FUIOU_ORDER_PRE").get(0).getColumnValue());
+ }else{
+ smallWeChatDto.setOrderPre("1066");
+ }
+ smallWeChatDto.setPayPassword(MappingCache.getValue(MappingConstant.WECHAT_STORE_DOMAIN, "key"));
+ smallWeChatDto.setObjId(paramIn.getString("communityId"));
+ return smallWeChatDto;
+// }
- return BeanConvertUtil.covertBean(smallWeChatDtos.get(0), SmallWeChatDto.class);
+// return BeanConvertUtil.covertBean(smallWeChatDtos.get(0), SmallWeChatDto.class);
}
/**
--
Gitblit v1.8.0