TRX 1 жил өмнө
parent
commit
57bb93892a

+ 2 - 0
PaymentServer/src/main/java/com/zhongshu/payment/server/core/controller/unionFrictionlessPay/FrictionlessController.java

@@ -17,6 +17,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
+import org.springframework.util.Assert;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
@@ -51,6 +52,7 @@ public class FrictionlessController {
     @Operation(summary = "无感支付开始签约(未登录状态)")
     @PostMapping(value = "signNotLogin", consumes = MediaType.APPLICATION_JSON_VALUE)
     public ResultContent signNotLogin(@RequestBody @Valid SignInParam param) {
+        Assert.hasText(param.getUserId(), "userId不能为空");
         return unionFrictionlessPayMainService.sign(param);
     }
 

+ 4 - 1
PaymentServer/src/main/java/com/zhongshu/payment/server/core/service/pay/impl/unionFrictionlessPay/UnionFrictionlessPayMainService.java

@@ -137,7 +137,10 @@ public class UnionFrictionlessPayMainService extends SuperPayService {
      * @return
      */
     public ResultContent sign(SignInParam param) {
-        String userId = getCurrentUserId();
+        String userId = param.getUserId();
+        if (StringUtils.isEmpty(userId)) {
+            userId = getCurrentUserId();
+        }
         String shopOid = param.getShopOid();
         ResultContent<UserCountModel> resultContent = userFeignService.getUserDetailByUserId(userId);
         if (resultContent.isFailed()) {