feature 代码提交

zhsw-wechat-common/src/main/java/com/rongwei/wechat/system/wechat/impl/PayMentServiceImpl.java

@@ -96,7 +96,7 @@ public class PayMentServiceImpl implements PayMentService {
         // 如果不允许在线支付，返回错误信息（包含状态信息）
         if ("n".equalsIgnoreCase(whethertopayonline)) {
             log.error("当前系统不允许在线缴费，配置值: {}", whethertopayonline);
-            return R.error("系统维护中，请一个小时后使用");
+            return R.error(swEnterpriseConfigInfoDo.getPaymentpromptinformation());
         }
         if (StringUtils.isBlank(enterpriseno)) {
             log.error("支付参数：企业编号 为空");
@@ -127,7 +127,8 @@ public class PayMentServiceImpl implements PayMentService {
             throw new CustomException("商户支付配置错误,请联系系统管理员!");
         }
 
-        WxPayApi wxPayApi = new WxPayApi(merchantid, merchantprivatekey, merchantserialnumber, merchantsecretkey, weChatAboutApiPara.getAppid(), weChatAboutApiPara.getPaymentCallbackUrl());
+        WxPayApi wxPayApi = new WxPayApi(merchantid, merchantprivatekey, merchantserialnumber, merchantsecretkey,
+                weChatAboutApiPara.getAppid(), weChatAboutApiPara.getPaymentCallbackUrl());
         wxPayApi.initMerchant();
         // 生成订单号 规则
         String nonceStr = UUID.randomUUID().toString().replaceAll("-", "");

zhsw-wechat-entity/src/main/java/com/rongwe/wechat/system/domain/SwEnterpriseConfigInfoDo.java

@@ -141,4 +141,8 @@ public class SwEnterpriseConfigInfoDo extends BaseDo implements Serializable {
      * 企业用户须知
      */
     private String usernotices;
+    /**
+     * 缴费异常提示信息
+     */
+    private String paymentpromptinformation="系统维护中，请一个小时后使用";
 }