.

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/api/video/YqdSyncOrderModel.java

@@ -13,7 +13,6 @@ import java.math.BigDecimal;
 public class YqdSyncOrderModel {
 
     private String orderNo;
-    private String Id;
     private Integer status;
     private String msg;
     private String mobile;

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/controller/SycController.java

@@ -3,6 +3,8 @@ package com.zswl.cloud.springBtach.server.core.controller;
 import cn.hutool.json.JSONUtil;
 import com.xiaoju.open.oil.commons.OilRequest;
 import com.xiaoju.open.oil.core.executor.ResponseDTO;
+import com.zhongshu.payment.client.model.order.v2.UpdateGoodsModel;
+import com.zhongshu.payment.client.service.v2.OrderService2;
 import com.zswl.cloud.springBtach.server.core.api.video.YqdSyncOrderModel;
 import com.zswl.cloud.springBtach.server.core.dao.ApiLogDao;
 import com.zswl.cloud.springBtach.server.core.domain.ApiLog;
@@ -26,6 +28,9 @@ public class SycController {
     @Autowired
     ApiLogDao apiLogDao;
 
+    @Autowired
+    OrderService2 orderService2;
+
 
     @ApiOperation("推送-同步订单信息")
     @RequestMapping(value = "xiaoju/notifyOrderInfo", method = RequestMethod.POST)
@@ -45,9 +50,14 @@ public class SycController {
     @RequestMapping(value = "yqd/orderState", method = RequestMethod.POST)
     public String receivingGasStation(@RequestBody YqdSyncOrderModel yqdSyncOrderModel) {
 
-        log.info("视频会员同步状态：{}", JSONUtil.toJsonStr(yqdSyncOrderModel));
+        if (!yqdSyncOrderModel.getStatus().equals(4)) {
+            UpdateGoodsModel updateGoodsModel = new UpdateGoodsModel();
+            updateGoodsModel.setId(yqdSyncOrderModel.getExternalOrderno());
+            updateGoodsModel.setDelivery(false);
+            orderService2.updateGoods(updateGoodsModel);
+        }
         ApiLog apiLog = new ApiLog();
-        apiLog.setSystem("yqd");
+        apiLog.setSystem("video");
         apiLog.setRequest(JSONUtil.toJsonStr(yqdSyncOrderModel));
         apiLog.setService("syncOrderState");
         apiLog.setResponse("ok");

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/job/video/VideoDeliveryJob.java

@@ -5,9 +5,12 @@ import cn.hutool.json.JSONUtil;
 import com.github.microservice.auth.client.content.ResultContent;
 import com.github.microservice.auth.client.content.ResultState;
 import com.zhongshu.payment.client.model.order.v2.GoodsResultModel;
+import com.zhongshu.payment.client.model.order.v2.UpdateGoodsModel;
 import com.zhongshu.payment.client.model.order.v2.VerificationModel;
+import com.zhongshu.payment.client.model.payment.SubOrdersConfirmResponseModel;
 import com.zhongshu.payment.client.service.v2.OrderService2;
 import com.zhongshu.payment.client.service.v2.PaymentService2;
+import com.zhongshu.payment.client.type.OrderType;
 import com.zswl.cloud.shop.client.service.GoodsService;
 import com.zswl.cloud.springBtach.server.core.api.video.YqdCreateRequestModel;
 import com.zswl.cloud.springBtach.server.core.api.video.YqdServiceImpl;
@@ -56,42 +59,47 @@ public class VideoDeliveryJob {
                     String account = String.valueOf(entries.get("account"));
 
 
-                    VerificationModel verificationModel = new VerificationModel();
-                    verificationModel.setId(goodsResultModel.getId());
-                    verificationModel.setShopId(goodsResultModel.getShopId());
-                    verificationModel.setVerification(new JSONObject());
-                    ResultContent verification = orderService2.verification(verificationModel);
-                    if (!verification.getState().equals(ResultState.Success)){
-
-                        log.info("核销状态变更失败：{}",JSONUtil.toJsonStr(goodsResultModel));
-                        getResultContent().set(ResultContent.build(ResultState.Fail));
-                        return RepeatStatus.FINISHED;
-
-                    }
-//                    OrderDto orderDto = new OrderDto();
-//                    orderDto.setCommodityId(goodsResultModel.getGoodsId());
-//                    orderDto.setPhone(account);
-//                    ResultContent resultContent = yqdServiceImpl.create(orderDto);
 
+                    // 调用三方充值
                     YqdCreateRequestModel createRequestModel = new YqdCreateRequestModel();
                     createRequestModel.setBuyCount(1);
-                    createRequestModel.setExternal_orderno(goodsResultModel.getOrderNo());
+                    createRequestModel.setExternal_orderno(goodsResultModel.getId());
                     createRequestModel.setCommodityId(goodsResultModel.getGoodsId());
                     createRequestModel.setTemplate(List.of(account));
                     createRequestModel.setExternalSellPrice(goodsResultModel.getPayAmount());
                     createRequestModel.setRemark(goodsResultModel.getUserId());
-
-
                     ResultContent yqdServiceImpl2 = yqdServiceImpl.create2(createRequestModel);
                     log.info("视频会员响应结果：{}", yqdServiceImpl2.getContent());
                     if (!yqdServiceImpl2.getState().equals(ResultState.Success)) {
                         getResultContent().set(ResultContent.build(ResultState.Fail));
                         return RepeatStatus.FINISHED;
                     }
+
+                    // 分账
+                    ResultContent<SubOrdersConfirmResponseModel> subOrdersConfirmResponseModelResultContent = paymentService2.subOrdersConfirm(goodsResultModel.getId(), goodsResultModel.getShopId());
+                    if (!subOrdersConfirmResponseModelResultContent.getState().equals(ResultState.Success)){
+                        log.info("分账失败：{}",JSONUtil.toJsonStr(goodsResultModel));
+                        getResultContent().set(ResultContent.build(ResultState.Fail));
+                        return RepeatStatus.FINISHED;
+                    }
+
+
+                    VerificationModel verificationModel = new VerificationModel();
+                    verificationModel.setId(goodsResultModel.getId());
+                    verificationModel.setShopId(goodsResultModel.getShopId());
+                    verificationModel.setVerification(new JSONObject());
                     String extend = goodsResultModel.getExtend();
                     JSONObject entries1 = JSONUtil.parseObj(extend);
-                    entries1.set("response", yqdServiceImpl2.getContent());
-                    orderService2.updateExtend(goodsResultModel.getId(), JSONUtil.toJsonStr(entries1));
+                    entries1.set("create", yqdServiceImpl2.getContent());
+
+                    UpdateGoodsModel updateGoodsModel = new UpdateGoodsModel();
+                    updateGoodsModel.setId(goodsResultModel.getId());
+                    updateGoodsModel.setDelivery(true);
+                    updateGoodsModel.setVerifyModel(entries1);
+                    updateGoodsModel.setGoodsState(OrderType.USED);
+                    updateGoodsModel.setVerifyModel(JSONUtil.parseObj(verificationModel));
+                    orderService2.updateGoods(updateGoodsModel);
+
                     getResultContent().set(ResultContent.build(ResultState.Success));
                     return RepeatStatus.FINISHED;