Merge branch 'feature/0416_pay' into test

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/PaymentMerchantConfigServiceImpl.java

@@ -62,6 +62,8 @@ public class PaymentMerchantConfigServiceImpl extends ServiceImpl<PaymentMerchan
                 adapayPayConfig.setKeyPrivate(config.getRsaPrivateKey());
                 adapayPayConfig.setWxAppId(config.getWxAppId());
                 adapayPayConfig.setWxAppSecret(config.getWxAppSecret());
+                adapayPayConfig.setMiniAppId(config.getMiniAppId());
+                adapayPayConfig.setMiniAppSecret(config.getMiniAppSerret());
                 adapayPayConfig.setSupportCreditCards(properties.getSupportCreditCards());
                 try {
                     AdapayPaymentServicePlugin plugin = new AdapayPaymentServicePlugin(config.getPaymentVendor(), adapayPayConfig, false);