更新

PaymentClient/src/main/java/com/zhongshu/payment/client/payModel/unionFrictionlessPay/paymentModel/SignInParam.java

@@ -13,6 +13,9 @@ import lombok.Data;
 @Data
 public class SignInParam {
 
+    @Schema(description = "用户userId")
+    private String userId;
+
     @Schema(description = "商户ID")
     private String shopOid;
 

PaymentServer/src/main/java/com/zhongshu/payment/server/core/controller/unionFrictionlessPay/FrictionlessController.java

@@ -41,10 +41,16 @@ public class FrictionlessController {
     AuthHelper authHelper;
 
     //---------------------------通知 start-----------------------------
-    @Operation(summary = "无感支付开始签约")
+    @Operation(summary = "无感支付开始签约（已登录状态）")
     @ResourceAuth(value = "user", type = AuthType.User)
     @PostMapping(value = "sign", consumes = MediaType.APPLICATION_JSON_VALUE)
-    public ResultContent payNotify(@RequestBody @Valid SignInParam param) {
+    public ResultContent sign(@RequestBody @Valid SignInParam param) {
+        return unionFrictionlessPayMainService.sign(param);
+    }
+
+    @Operation(summary = "无感支付开始签约（未登录状态）")
+    @PostMapping(value = "signNotLogin", consumes = MediaType.APPLICATION_JSON_VALUE)
+    public ResultContent signNotLogin(@RequestBody @Valid SignInParam param) {
         return unionFrictionlessPayMainService.sign(param);
     }
 

PaymentServer/src/main/java/com/zhongshu/payment/server/core/controller/wxPaymentV3/WechatNotifyController.java

@@ -2,6 +2,7 @@ package com.zhongshu.payment.server.core.controller.wxPaymentV3;
 
 import com.zhongshu.payment.server.core.service.RechargeService;
 import com.zhongshu.payment.server.core.service.pay.impl.wxPaymentV3.WxPayNotifyService;
+import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
@@ -21,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/wechat/v3/notify")
 @Tag(name = "微信支付通知回调")
+@Hidden
 public class WechatNotifyController {
 
     @Autowired

PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/pay/impl/unionFrictionlessPay/CooperatorService.java

@@ -102,6 +102,12 @@ public class CooperatorService extends SuperService {
         return ResultContent.buildSuccess(toModel(record));
     }
 
+    /**
+     * 检查提现记录状态
+     *
+     * @param record
+     * @return
+     */
     private ShopWithDrawRecord checkDrawState(ShopWithDrawRecord record) {
         if (record != null && record.getWithDrawState() != WithDrawState.Success) {
             if (StringUtils.isEmpty(record.getStatus()) || !"-1".equals(record.getStatus())) {