gongfuzhu 8 meses atrás
pai
commit
c6ef130491

+ 5 - 1
SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/video2/RechargeRequest.java

@@ -27,6 +27,10 @@ public class RechargeRequest {
             "- 0:其他", required = true)
     private Integer accountType;
 
-    @ApiModelProperty(value = "特殊场景参数", required = true)
+    @ApiModelProperty(value = "特殊场景参数")
     private String extendParameter;
+
+    @NotNull
+    @ApiModelProperty(value = "用户ID", required = true)
+    private String userId;
 }

+ 4 - 1
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/impl/Video2ServiceImpl.java

@@ -165,6 +165,9 @@ public class Video2ServiceImpl implements Video2Service {
 
         RechargeProductResp rechargeProductResp = video2Api.rechargeProduct();
         List<ProductItemResp> collect = rechargeProductResp.getProducts().stream().filter(productItemResp -> productItemResp.getProductId().equals(rechargeOrderReq.getProductId())).collect(Collectors.toList());
+       if (collect.isEmpty()){
+           return ResultContent.build(ResultState.Fail, "视频会员不存在");
+       }
         ProductItemResp productItemResp = collect.get(0);
         BigDecimal totalPrice = BigDecimal.ZERO;
         com.zswl.cloud.shop.client.ret.ResultContent<AccountDetailVo> shopSetting = shopService.shopSetting("视频会员");
@@ -183,7 +186,7 @@ public class Video2ServiceImpl implements Video2Service {
         // 平台订单
         CreateOrder2Model createOrder2Model = new CreateOrder2Model();
         createOrder2Model.setOrderNo(orderNo);
-        createOrder2Model.setUserId(authHelper.getCurrentUser().getUserId());
+        createOrder2Model.setUserId(rechargeRequest.getUserId());
         createOrder2Model.setShopId(shopId);
         JSONObject shopInfo = JSONUtil.parseObj(shopSetting);
         createOrder2Model.setShopInfo(shopInfo);