2021与蓝度共同重构项目,服务端
liuhaonan
2022-06-27 eee37d696c4b5e1b2d1117e781e93eadc3c3fbe7
支付配置
已修改3个文件
61 ■■■■ 文件已修改
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxPayConfiguration.java 54 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/resources/application.yml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/C3mOrderController.java
@@ -86,7 +86,7 @@
        param.setOutTradeNo(c3mOrderEntity.getOutTradeNo());
        param.setTotalAmount(c3mOrderEntity.getTotalAmount());
        String s = WxFastPayService.parseWxAmount(param.getTotalAmount().toString());
        SortedMap<Object, Object> result = wxPayService.miniAppPay("扫码充电支付(C3充电桩)", param.getOutTradeNo(),Integer.valueOf(s) , param.getPoleId());
        SortedMap<Object, Object> result = wxPayService.miniAppPay("扫码充电支付(C3充电桩)", param.getOutTradeNo(), Integer.valueOf(s), param.getPoleId());
        return ResponseUtil.success(result);
    }
ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxPayConfiguration.java
@@ -14,30 +14,30 @@
/**
 * @author Binary Wang
 */
@Configuration
@ConditionalOnClass(WxPayService.class)
@EnableConfigurationProperties(WxPayProperties.class)
@AllArgsConstructor
public class WxPayConfiguration {
  private WxPayProperties properties;
  @Bean
  @ConditionalOnMissingBean
  public WxPayService wxService() {
    WxPayConfig payConfig = new WxPayConfig();
    payConfig.setAppId(StringUtils.trimToNull(this.properties.getAppId()));
    payConfig.setMchId(StringUtils.trimToNull(this.properties.getMchId()));
    payConfig.setMchKey(StringUtils.trimToNull(this.properties.getMchKey()));
    payConfig.setSubAppId(StringUtils.trimToNull(this.properties.getSubAppId()));
    payConfig.setSubMchId(StringUtils.trimToNull(this.properties.getSubMchId()));
    payConfig.setKeyPath(StringUtils.trimToNull(this.properties.getKeyPath()));
    // 可以指定是否使用沙箱环境
    payConfig.setUseSandboxEnv(false);
    WxPayService wxPayService = new WxPayServiceImpl();
    wxPayService.setConfig(payConfig);
    return wxPayService;
  }
}
//@Configuration
//@ConditionalOnClass(WxPayService.class)
//@EnableConfigurationProperties(WxPayProperties.class)
//@AllArgsConstructor
//public class WxPayConfiguration {
//  private WxPayProperties properties;
//
//  @Bean
//  @ConditionalOnMissingBean
//  public WxPayService wxService() {
//    WxPayConfig payConfig = new WxPayConfig();
//    payConfig.setAppId(StringUtils.trimToNull(this.properties.getAppId()));
//    payConfig.setMchId(StringUtils.trimToNull(this.properties.getMchId()));
//    payConfig.setMchKey(StringUtils.trimToNull(this.properties.getMchKey()));
//    payConfig.setSubAppId(StringUtils.trimToNull(this.properties.getSubAppId()));
//    payConfig.setSubMchId(StringUtils.trimToNull(this.properties.getSubMchId()));
//    payConfig.setKeyPath(StringUtils.trimToNull(this.properties.getKeyPath()));
//
//    // 可以指定是否使用沙箱环境
//    payConfig.setUseSandboxEnv(false);
//
//    WxPayService wxPayService = new WxPayServiceImpl();
//    wxPayService.setConfig(payConfig);
//    return wxPayService;
//  }
//
//}
ximon-admin/src/main/resources/application.yml
@@ -22,11 +22,6 @@
logging:
  file:
    path: logs
wx:
  pay:
    appId: dsd #微信公众号或者小程序等的appid
    mchId: dsdsd #微信支付商户号
    mchKey: dsd #微信支付商户密钥
# led屏幕服务器地址(更改需要同时更改)