优化共汇总好开发

java110-bean/src/main/java/com/java110/dto/app/AppDto.java

@@ -17,6 +17,8 @@ public class AppDto extends PageDto implements Serializable {
 
     //web端APP_ID
     public static final String WEB_APP_ID = "8000418004";
+    public static final String WECHAT_OWNER_APP_ID = "992020061452450002";
+    public static final String WECHAT_MINA_OWNER_APP_ID = "992019111758490006";
 
     private String appId;
     private String blackListIp;

service-api/src/main/java/com/java110/api/listener/smallWeChat/ListSmallWeChatsListener.java

@@ -7,6 +7,7 @@ import com.java110.core.context.DataFlowContext;
 import com.java110.core.event.service.api.ServiceDataFlowEvent;
 import com.java110.core.factory.WechatFactory;
 import com.java110.core.smo.store.ISmallWeChatInnerServiceSMO;
+import com.java110.dto.app.AppDto;
 import com.java110.dto.smallWeChat.SmallWeChatDto;
 import com.java110.utils.constant.ServiceCodeSmallWeChatConstant;
 import com.java110.utils.util.BeanConvertUtil;
@@ -97,7 +98,7 @@ public class ListSmallWeChatsListener extends AbstractServiceApiListener {
 
         for (ApiSmallWeChatDataVo apiSmallWeChatDataVo : smallWeChats) {
             apiSmallWeChatDataVo.setwId(WechatFactory.getWId(apiSmallWeChatDataVo.getAppId()));
-            if (OWNER_APP.equals(appId) || OWNER_WECHAT_APP.equals(appId)) {
+            if (AppDto.WECHAT_MINA_OWNER_APP_ID.equals(appId) || AppDto.WECHAT_OWNER_APP_ID.equals(appId)) {
                 continue;
             }
             apiSmallWeChatDataVo.setAppSecret("");

service-front/src/main/java/com/java110/front/smo/payment/impl/ToPaySMOImpl.java

@@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONArray;
 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,8 +83,17 @@ public class ToPaySMOImpl extends AppAbstractComponentSMO implements IToPaySMO {
         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());
+        tmpParamIn.put("appType", appType);
         responseEntity = super.getOwnerAppUser(pd, restTemplate, tmpParamIn);
         logger.debug("查询用户信息返回报文：" + responseEntity);
         if (responseEntity.getStatusCode() != HttpStatus.OK) {