Merge remote-tracking branch 'origin/master'

liuhaonan

2022-06-30 ae2e17d478f444a5c9c054dc13b83a0dbdd750bd

 ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java

@@ -205,24 +205,21 @@
     */
    @Transactional(rollbackFor = Exception.class)
    public SortedMap<Object, Object> miniAppPay(String body, String orderId, int totalFee, Long poleId, String wxCode) throws WxErrorException {
//        WxConfigEntity wxConfig = wxPayConfigService.getConfigByPoleId(poleId);
        WxConfigEntity wxConfig = new WxConfigEntity();
        wxConfig.setAppid("wx3d7b3ba37fee07de");
        wxConfig.setMchId("1536603671");
        wxConfig.setPrivateKey("0yec5jkwqy4muv5313yn520rdq5cfmqu");
//        wxConfig.setMchId(wxConfig.getMchId().trim());
        WxConfigEntity wxConfig = wxPayConfigService.getConfigByPoleId(poleId);

        //设置微信支付参数
        WxPayConfig payConfig = new WxPayConfig();
        payConfig.setAppId(StringUtils.trimToNull("wx3d7b3ba37fee07de"));
        payConfig.setMchId(StringUtils.trimToNull("1536603671"));
        payConfig.setMchKey(StringUtils.trimToNull("0yec5jkwqy4muv5313yn520rdq5cfmqu"));

        payConfig.setAppId(StringUtils.trimToNull(wxConfig.getAppid()));
        payConfig.setMchId(StringUtils.trimToNull(wxConfig.getMchId()));
        payConfig.setMchKey(StringUtils.trimToNull(wxConfig.getPrivateKey()));
        payConfig.setSubAppId(StringUtils.trimToNull(null));
        payConfig.setSubMchId(StringUtils.trimToNull(null));
        payConfig.setKeyPath(StringUtils.trimToNull(null));
        wxPayService.setConfig(payConfig);


        WxMaJscode2SessionResult sessionInfo = this.getWxMaService(wxConfig).getUserService().getSessionInfo(wxCode);



        //设置微信同一订单请求
@@ -230,7 +227,7 @@
        wxPayUnifiedOrderRequest.setBody(body);
        wxPayUnifiedOrderRequest.setOutTradeNo(orderId);
        wxPayUnifiedOrderRequest.setTotalFee(totalFee);
        wxPayUnifiedOrderRequest.setOpenid(sessionInfo.getOpenid());
        wxPayUnifiedOrderRequest.setOpenid(wxCode);


        wxPayUnifiedOrderRequest.setSignType(WxPayConstants.SignType.MD5);
@@ -276,18 +273,19 @@
        }
        WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
        config.setAppid(wxConfig.getAppid());
        config.setSecret("05edea692eb1b70670ec9ac6e9c62a84");
        config.setSecret(wxConfig.getAppSecret());
        WxMaService service = new WxMaServiceImpl();
        service.setWxMaConfig(config);
        return service;
    }

    public String getOpenId(Long poleId, String wxCode) throws WxErrorException {
//        WxConfigEntity wxConfig = wxPayConfigService.getConfigByPoleId(poleId);
        WxConfigEntity userConfig = wxPayConfigService.getConfigByPoleId(poleId);
        WxConfigEntity wxConfig = new WxConfigEntity();
        wxConfig.setAppid("wx3d7b3ba37fee07de");
        wxConfig.setMchId("1536603671");
        wxConfig.setPrivateKey("0yec5jkwqy4muv5313yn520rdq5cfmqu");
        wxConfig.setAppid(userConfig.getAppid());
        wxConfig.setMchId(userConfig.getMchId());
        wxConfig.setPrivateKey(userConfig.getPrivateKey());
        wxConfig.setAppSecret(userConfig.getAppSecret());
        if (wxConfig == null) {
            throw new BusinessException("找不到微信配置");
        }