银盛新增加部分

pluss-common-bundle/src/main/resources/config/application-common.yml

@@ -97,10 +97,12 @@ parameter:
   ALI_APP_ID: 支付宝原生接入的APPID
   ALI_RATE: 0.006
   ALI_RETURN_URL: ${parameter.domain}/wap/aliPay/returnUrl
-  APPID: wxfffc7bff64c7a11e
+  APPID: wx8f4f3d7cef4a6848
+  # wxfffc7bff64c7a11e
   #小程序付款APPID
   APPLETS_APPID: wxfffc7bff64c7a11e
-  APPSECRET: b84ee0efaa0d9a649746ac65525f8e10
+  APPSECRET: 520028296c79988a053fb29f84b057a2
+  # b84ee0efaa0d9a649746ac65525f8e10
   KEY: 微信原生加密用的KEY
   LESHUALIU: 乐刷、未接入可不管
   LESHUA_API:

pluss-service-bundle/src/main/java/cn/pluss/platform/ys/impl/v20220527/YsConfigV3.java

@@ -1,8 +1,18 @@
 package cn.pluss.platform.ys.impl.v20220527;
 
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
 /**
  * @author DJH
  */
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "ys")
 public class YsConfigV3 {
 
     /**
@@ -14,4 +24,42 @@ public class YsConfigV3 {
      * 商户重新报备，已报备过的商户可以重新报备
      */
     public static String MER_REPORT_AGAIN = "https://ysgate.ysepay.com/openapi/smsc/saas/sweep/reportAgain";
+
+
+
+    /**
+     * 发起方交易号
+     */
+    private String srcMerchantNo;
+
+    @Value("agentNoV2")
+    private String agentNo;
+
+    public static final String INTERFACE_VERSION = "v3";
+
+    public static final String REQ_SUCCESS = "00000";
+
+    public static final String BIZ_SUCCESS = "0000";
+
+    public static final String AUDIT_NOTIFY_URL = "https://www.shouyinbei.net/api/auditCallback/ysV3";
+
+    public static final String AUDIT_SIGN_NOTIFY_URL = "https://www.shouyinbei.net/api/auditCallback/ysSignV3";
+
+    /** 成功 */
+    public static final String STATUS_SUCCESS = "00";
+
+    /** 审核中 */
+    public static final String STATUS_IN_AUDIT = "02";
+
+    /** 转人工审核 */
+    public static final String STATUS_TO_MANUAL = "10";
+
+    /** 拒绝 */
+    public static final String STATUS_REFUSE = "90";
+
+    /** 签约拒绝，主动查询时候会存在该状态 */
+    public static final String STATUS_SIGN_REFUSE = "04";
+
+    /** 错误 */
+    public static final String STATUS_FAIL = "99";
 }

pluss-wap-page/src/main/java/cn/pluss/platform/controller/component/PayCallbackConsumer.java

@@ -38,6 +38,7 @@ public class PayCallbackConsumer {
             return;
         }
         if(!"1".equals(order.getOrderType())){
+            System.out.println("+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
             realFansService.createFansProfit(order);
         }
         merchantProfitService.createOrderProfitV2(order,"1");