Merge remote-tracking branch 'origin/bd_test' into bd_test

bd-third/src/main/java/com/hzs/third/pay/controller/api/PayController.java

@@ -3,6 +3,7 @@ package com.hzs.third.pay.controller.api;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.hzs.activity.base.IActivityServiceApi;
 import com.hzs.common.core.annotation.RepeatSubmitSimple;
+import com.hzs.common.core.constant.SysConstants;
 import com.hzs.common.core.domain.R;
 import com.hzs.common.core.enums.*;
 import com.hzs.common.core.utils.CommonUtil;
@@ -346,6 +347,11 @@ public class PayController {
             payConfigVO.setPay82((Boolean) redisTemplate.opsForValue().get(pay82));
         }
 
+        if (SysConstants.SPECIAL_CODE.equals(SecurityUtils.getMemberCode())) {
+            // 在线支付测试账号，强制显示支付方式
+            payConfigVO.setPay5(true);
+        }
+
         return AjaxResult.success(payConfigVO);
     }
 

bd-third/src/main/java/com/hzs/third/pay/vo/OnlinePayConfigVO.java

@@ -3,20 +3,11 @@ package com.hzs.third.pay.vo;
 import lombok.Data;
 
 /**
- * @Description: 在线支付配置VO
+ * 在线支付配置VO
- * @Author: jiang chao
- * @Time: 2022/11/16 13:42
- * @Classname: OnlinePayConfigVO
- * @PackageName: com.hzs.web.controller.onlinePayConfig.vo
  */
 @Data
 public class OnlinePayConfigVO {
 
-    /**
-     * 京东银行卡
-     */
-    private Boolean pay4 = Boolean.FALSE;
-
     /**
      * 京东收银台（H5）
      */
@@ -26,29 +17,6 @@ public class OnlinePayConfigVO {
      */
     private Boolean pay6 = Boolean.FALSE;
 
-    /**
-     * 宝付微信
-     */
-    private Boolean pay11 = Boolean.FALSE;
-    /**
-     * 宝付微信扫码
-     */
-    private Boolean pay12 = Boolean.FALSE;
-
-    /**
-     * 汇付微信
-     */
-    private Boolean pay13 = Boolean.FALSE;
-    /**
-     * 汇付银行卡
-     */
-    private Boolean pay15 = Boolean.FALSE;
-
-    /**
-     * 微信APP
-     */
-    private Boolean pay20 = Boolean.FALSE;
-
     /**
      * 通联微信
      */

bd-third/src/main/resources/bootstrap.yml

@@ -84,77 +84,6 @@ wechat:
   ## 公众号appSecret
   publicAppSecret: 896bf6b984b44b192e3f71e96002b800
 
-
-## 京东收银台支付配置
-jd:
-  bank:
-    ## 二级商户号
-    merchantNo: 153428607005
-    ## 签名密钥
-    signKey: 3d2647236d1c70e25b5acf6b9d903136439e29a06c50a412dc0c7bc3de2ef523
-    ## 证书加密密码
-    priCertPwd: bd147258369
-    ## 私钥文件名
-    priCert: jd/merchantCert005.pfx
-    ## 公钥文件名
-    pubCert: jd/npp_11_API2_pro.cer
-    ## 生产环境api接口域名
-    apiDomain: http://wapi.jd.com
-    ## 页面回调地址
-#    pageBackUrl: https://t-app.beida666.com/prod-api/pay/jd/sync-notify
-    pageBackUrl: http://t-app.beida666.com/#/pages/pay/success
-    ## 支付回调地址
-    notifyUrl: https://t-app.beida666.com/prod-api/pay/jd/trade-notify
-#    notifyUrl: https://b747-218-57-66-5.ngrok-free.app/pay/jd/trade-notify
-    ## 退款回调地下
-    refundNotifyUrl: https://t-app.beida666.com/prod-api/pay/jd-refund/trade-notify
-#    refundNotifyUrl: https://b747-218-57-66-5.ngrok-free.app/pay/jd-refund/trade-notify
-    separateAccounts:
-      - account: 153428607007
-        proportion: 0.7
-      - account: 153428607005
-        proportion: 0.3
-  wechat-alipay:
-    ## 二级商户号
-    merchantNo: 153428607006
-    ## 签名密钥
-    signKey: 34ea117103df740ac66847aa7aebbbb2ee58ef716b8bc0c525ef90eb3fbdd4b0
-    ## 证书加密密码
-    priCertPwd: bd258369147
-    ## 私钥文件名
-    priCert: jd/merchantCert006.pfx
-    ## 公钥文件名
-    pubCert: jd/npp_11_API2_pro.cer
-    ## 生产环境api接口域名
-    apiDomain: http://wapi.jd.com
-    ## 页面回调地址
-    #    pageBackUrl: https://t-app.beida666.com/prod-api/pay/jd/sync-notify
-    pageBackUrl: http://t-app.beida666.com/#/pages/pay/success
-    ## 支付回调地址
-    #    notifyUrl: https://t-app.beida666.com/prod-api/pay/jd/trade-notify
-    notifyUrl: https://b747-218-57-66-5.ngrok-free.app/pay/jd/trade-notify
-    ## 退款回调地下
-    #    refundNotifyUrl: https://t-app.beida666.com/prod-api/pay/jd-refund/trade-notify
-    refundNotifyUrl: https://b747-218-57-66-5.ngrok-free.app/pay/jd-refund/trade-notify
-    separateAccounts:
-      - account: 153428607008
-        proportion: 0.7
-      - account: 153428607006
-        proportion: 0.3
-  transfer-out:
-    ## 二级商户号
-    merchantNo: 153428607004
-    ## 签名密钥
-    signKey: ed2f00e3a9025d147e5edf465b15214a90ee364b2e3e4a006c25d38e767dec98
-    ## 证书加密密码
-    priCertPwd: bd369147258
-    ## 私钥文件名
-    priCert: jd/merchantCert004.pfx
-    ## 公钥文件名
-    pubCert: jd/npp_11_API2_pro.cer
-    ## 生产环境api接口域名
-    apiDomain: http://wapi.jd.com
-
 ## 通联支付配置
 allinpay:
   #  #################### 基础支付相关（正式） ####################