gongfuzhu преди 1 година
родител
ревизия
b42eef3709

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

@@ -61,7 +61,8 @@ public class CreateOrder2Request {
      * 第三方订单号
      */
     private String orderId;
-    private Long orderPayMode;
+
+    private Integer orderPayMode;
     /**
      * 原票价单价
      */

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

@@ -16,11 +16,13 @@ import com.zhongshu.payment.client.type.TransferType;
 import com.zswl.cloud.shop.client.service.ShopService;
 import com.zswl.cloud.shop.client.vo.life.AccountDetailVo;
 import com.zswl.cloud.shop.client.vo.life.SharePlatformVo;
+import com.zswl.cloud.springBatch.client.model.ypp.request.CreateOrder2Request;
 import com.zswl.cloud.springBatch.client.model.ypp.request.CreateOrdereRquest;
-import com.zswl.cloud.springBatch.client.model.ypp.response.CreateOrdereResponse;
+import com.zswl.cloud.springBatch.client.model.ypp.response.CreateOrder2Response;
 import com.zswl.cloud.springBatch.client.model.ypp.response.OrderDetailResponse;
 import com.zswl.cloud.springBtach.server.core.api.ypp.YppApi;
 import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -59,10 +61,18 @@ public class YppService {
         String shopId = accountDetailVo.getAccountId();
         String authAccount = accountDetailVo.getAuthAccount();
         SharePlatformVo sharePlatformVo = accountDetailVo.getSharePlatformVo();
-
-
-        CreateOrdereResponse createOrdereResponse = yppApi.create_order(createOrdereRquest);
-        String data = createOrdereResponse.getData();
+        CreateOrder2Request createOrder2Request = new CreateOrder2Request();
+
+        BeanUtils.copyProperties(createOrder2Request, createOrdereRquest);
+        //0 是创建即支付,1是后支付,等待你们的支付通知
+        createOrder2Request.setOrderPayMode(1);
+        //是否可调座
+        createOrder2Request.setSwitchSeat(false);
+        CreateOrder2Response createOrder2Response = yppApi.create_order2(createOrder2Request);
+        String data = createOrder2Response.getData().getOrderId();
+
+//        CreateOrdereResponse createOrdereResponse = yppApi.create_order(createOrdereRquest);
+//        String data = createOrdereResponse.getData();
         OrderDetailResponse orderDetailResponse = yppApi.order_detail(data);
         BigDecimal totalUserPrice = orderDetailResponse.getData().getTotalUserPrice();
 
@@ -114,7 +124,7 @@ public class YppService {
         ownerList.add(buy);
         ownerList.add(use);
         goods.setTransferRrule(ownerList);
-        goods.setExtend(JSONUtil.toJsonStr(createOrdereResponse));
+        goods.setExtend(JSONUtil.toJsonStr(createOrder2Response));
         createOrder2Model.setGoodsList(List.of(goods));
 
         return orderService2.creat(createOrder2Model);