From 4e649ff1f69583493027855f54c65e8207f4f860 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 06 八月 2020 15:57:19 +0800
Subject: [PATCH] 优化费用导入模板下载功能
---
service-front/src/main/java/com/java110/front/smo/payment/impl/ToPaySMOImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/service-front/src/main/java/com/java110/front/smo/payment/impl/ToPaySMOImpl.java b/service-front/src/main/java/com/java110/front/smo/payment/impl/ToPaySMOImpl.java
index 607b46a..37abb26 100644
--- a/service-front/src/main/java/com/java110/front/smo/payment/impl/ToPaySMOImpl.java
+++ b/service-front/src/main/java/com/java110/front/smo/payment/impl/ToPaySMOImpl.java
@@ -4,6 +4,8 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.context.IPageData;
import com.java110.core.context.PageData;
+import com.java110.dto.app.AppDto;
+import com.java110.dto.owner.OwnerAppUserDto;
import com.java110.dto.smallWeChat.SmallWeChatDto;
import com.java110.front.properties.WechatAuthProperties;
import com.java110.front.smo.AppAbstractComponentSMO;
@@ -81,9 +83,18 @@
JSONObject orderInfo = JSONObject.parseObject(responseEntity.getBody().toString());
String orderId = orderInfo.getString("oId");
double money = Double.parseDouble(orderInfo.getString("receivableAmount"));
+ String appType = OwnerAppUserDto.APP_TYPE_WECHAT_MINA;
+ if (AppDto.WECHAT_OWNER_APP_ID.equals(pd.getAppId())) {
+ appType = OwnerAppUserDto.APP_TYPE_WECHAT;
+ }else if(AppDto.WECHAT_MINA_OWNER_APP_ID.equals(pd.getAppId())){
+ appType = OwnerAppUserDto.APP_TYPE_WECHAT_MINA;
+ }else{
+ appType = OwnerAppUserDto.APP_TYPE_APP;
+ }
Map tmpParamIn = new HashMap();
tmpParamIn.put("userId", pd.getUserId());
- responseEntity = super.getUserAndAttr(pd, restTemplate, tmpParamIn);
+ tmpParamIn.put("appType", appType);
+ responseEntity = super.getOwnerAppUser(pd, restTemplate, tmpParamIn);
logger.debug("鏌ヨ鐢ㄦ埛淇℃伅杩斿洖鎶ユ枃锛�" + responseEntity);
if (responseEntity.getStatusCode() != HttpStatus.OK) {
throw new IllegalArgumentException("鏈煡璇㈢敤鎴蜂俊鎭紓甯�" + tmpParamIn);
@@ -96,7 +107,7 @@
throw new IllegalArgumentException("鏈煡璇㈠井淇＄敤鎴�");
}
- JSONObject realUserInfo = userResult.getJSONArray("users").getJSONObject(0);
+ JSONObject realUserInfo = userResult.getJSONArray("data").getJSONObject(0);
String openId = realUserInfo.getString("openId");
// String payAppId = orderInfo.getString("payAppId");
--
Gitblit v1.8.0