充值配置

car-wash-miniapp/src/main/java/com/kym/miniapp/controller/CommonController.java

@@ -43,6 +43,6 @@ public class CommonController {
      */
     @GetMapping("/rechargeConfig")
     R<?> rechargeConfig() {
-        return R.success(rechargeConfigService.list().stream().findFirst());
+        return R.success(rechargeConfigService.list());
     }
 }

car-wash-service/src/main/java/com/kym/service/wechat/impl/WxPayServiceImpl.java

@@ -161,16 +161,16 @@ public class WxPayServiceImpl implements WxPayService {
             ClassPathResource resource = new ClassPathResource(conf.getKeyPath());
             privateKey = IoUtil.read(resource.getInputStream(), StandardCharsets.UTF_8);
         }
-//        config = new RSAAutoCertificateConfig.Builder()
-//                .merchantId(conf.getMchid()) // 商户号
-//                .privateKey(privateKey)//商户API私钥路径
-//                .merchantSerialNumber(conf.getMchsn()) // 商户证书序列号
-//                .apiV3Key(conf.getV3key()) // 商户APIV3密钥
-//                .build();
-//        jsapiService = new JsapiService.Builder().config(config).build();
-//        refundService = new RefundService.Builder().config(config).build();
-//
-//        wxHttpClient = (OkHttpClientAdapter) new DefaultHttpClientBuilder().newInstance().config(config).build();
+        config = new RSAAutoCertificateConfig.Builder()
+                .merchantId(conf.getMchid()) // 商户号
+                .privateKey(privateKey)//商户API私钥路径
+                .merchantSerialNumber(conf.getMchsn()) // 商户证书序列号
+                .apiV3Key(conf.getV3key()) // 商户APIV3密钥
+                .build();
+        jsapiService = new JsapiService.Builder().config(config).build();
+        refundService = new RefundService.Builder().config(config).build();
+
+        wxHttpClient = (OkHttpClientAdapter) new DefaultHttpClientBuilder().newInstance().config(config).build();
 
         // 初始化微信电子发票开发配置，主要是回调地址 todo 区块链电子发票开通后放开
         // devConfig();