斗拱支付

mp-service/src/main/java/com/qs/mp/pay/service/impl/WalletServiceImpl.java

@@ -521,7 +521,8 @@ public class WalletServiceImpl implements IWalletService {
                         String orderRemark, Integer appSource, String clientType) throws ServiceException{
     JSONObject data = new JSONObject();
 
-    String appId = channelAppId;
+    //用户端小程序appId
+    String appId = userAppId;
     String payShopNo = channelPayShopNo;
     String paySign = channelPaySign;
 
@@ -616,18 +617,15 @@ public class WalletServiceImpl implements IWalletService {
     wxRequestParam.setTradeType(com.qs.mp.common.constant.Constants.PAY_STYLE_WXMINI_DOUGONG);
     wxRequestParam.setOpenid(code);
     List<PaymentConfig> paymentConfigList = dougongPayApi.getAvailablePaymentConfigList();
-    LogUtil.info(logger,"斗拱配置个数：-------------------------------》" + paymentConfigList.size());
-    LogUtil.info(logger,"斗拱配置参数1：-------------------------------》" + JSONUtil.toJsonStr(paymentConfigList.get(0)));
     PaymentConfig paymentConfig = CollectionUtil.isNotEmpty(paymentConfigList) ? RandomUtil.randomEle(paymentConfigList) : null;
-    LogUtil.info(logger,"斗拱配置参数2：-------------------------------》" + JSONUtil.toJsonStr(paymentConfig));
 
-    /*if(StringUtils.isEmpty(wxAppId)){
+    if(StringUtils.isEmpty(wxAppId)){
       wxAppId = Objects.nonNull(paymentConfig) ? paymentConfig.getAppletId() : "";
     }else{
       final String appId0 = wxAppId;
       paymentConfig = CollectionUtil.isNotEmpty(paymentConfigList) ? paymentConfigList.stream().filter(p->appId0.equals(p.getAppletId())).findFirst().orElse(null) : null;
       LogUtil.info(logger,"wxCreateJSAPIOrderWxminiDougong--appId:{}",wxAppId);
-    }*/
+    }
 
     wxRequestParam.setAppid(Objects.nonNull(paymentConfig) ? paymentConfig.getAppletId() : "");
     wxRequestParam.setPayStyle(payStyle);