gongfuzhu před 1 rokem
rodič
revize
b494032b00

+ 2 - 0
SpringBatchServiceClient/src/main/java/com/zswl/cloud/springBatch/client/model/ypp/request/CreateOrdereRquest.java

@@ -1,6 +1,7 @@
 package com.zswl.cloud.springBatch.client.model.ypp.request;
 
 import com.zhongshu.payment.client.type.Channel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -17,6 +18,7 @@ public class CreateOrdereRquest {
     /**
      * 应用AppId
      */
+    @ApiModelProperty(hidden = true)
     private String appId;
     /**
      * 观众列表ID,用,分隔

+ 1 - 0
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/api/ypp/YppApi.java

@@ -109,6 +109,7 @@ public class YppApi {
      * @return
      */
     public CreateOrdereResponse create_order(CreateOrdereRquest createOrdereRquest) {
+        createOrdereRquest.setAppId(appId);
         JSONObject entries = httpPost("https://channel.youpiaopiao.cn/api/movie/create_order", createOrdereRquest);
         CreateOrdereResponse bean = JSONUtil.toBean(entries, CreateOrdereResponse.class);
         return bean;

+ 9 - 0
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/YppController.java

@@ -3,10 +3,13 @@ package com.zswl.cloud.springBtach.server.core.controller;
 import com.github.microservice.auth.client.content.ResultContent;
 import com.github.microservice.auth.security.annotations.ResourceAuth;
 import com.github.microservice.auth.security.type.AuthType;
+import com.zhongshu.payment.client.model.order.v2.CreatOrderResultModel;
+import com.zswl.cloud.springBatch.client.model.ypp.request.CreateOrdereRquest;
 import com.zswl.cloud.springBtach.server.core.service.YppService;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -23,6 +26,12 @@ public class YppController {
 
 
 
+    @ApiOperation("创建订单")
+    @ResourceAuth(value = "user", type = AuthType.User)
+    @RequestMapping(value = "create_order", method = RequestMethod.POST)
+    public ResultContent<CreatOrderResultModel> create_order2(@RequestBody CreateOrdereRquest createOrdereRquest) {
+        return yppService.create_order(createOrdereRquest);
+    }
     @ApiOperation("热映电影(pageIndex从0开始)")
     @ResourceAuth(value = "user", type = AuthType.User)
     @RequestMapping(value = "movies", method = RequestMethod.GET)

+ 2 - 1
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/YppService.java

@@ -7,6 +7,7 @@ import cn.hutool.json.JSONUtil;
 import com.github.microservice.auth.client.content.ResultContent;
 import com.github.microservice.auth.client.content.ResultState;
 import com.github.microservice.auth.security.helper.AuthHelper;
+import com.zhongshu.payment.client.model.order.v2.CreatOrderResultModel;
 import com.zhongshu.payment.client.model.order.v2.CreateOrder2Model;
 import com.zhongshu.payment.client.service.v2.OrderService2;
 import com.zhongshu.payment.client.type.JobFlowMap;
@@ -47,7 +48,7 @@ public class YppService {
     private ShopService shopService;
 
 
-    public ResultContent create_order2(CreateOrdereRquest createOrdereRquest) {
+    public ResultContent<CreatOrderResultModel> create_order(CreateOrdereRquest createOrdereRquest) {
         com.zswl.cloud.shop.client.ret.ResultContent<AccountDetailVo> shopSetting = shopService.shopSetting("有票票");
         if (!shopSetting.getState().equals(com.zswl.cloud.shop.client.ret.ResultState.Success)) {
             return ResultContent.build(ResultState.Fail, "有票票信息未配置");

+ 1 - 1
SpringBatchServiceServer/src/main/resources/application-dev.yml

@@ -33,7 +33,7 @@ swagger:
 ypp:
   entId: 101206
   appSecret: VqJfaVYc87wDKk8Gad4yAx9v8TFNhrt0
-  appId: 101206
+  appId: APP101206
   test: true
 
 # 笛风云