修改核销方式

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/job/standard/StandarVerificationJob.java

@@ -1,10 +1,13 @@
 package com.zswl.cloud.springBtach.server.core.job.standard;
 
 import cn.hutool.json.JSONObject;
+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.zswl.cloud.shop.client.service.ShopService;
@@ -95,9 +98,14 @@ public class StandarVerificationJob {
                     verificationModel.setShopName(shopDetailVo.getShopName());
                     verificationModel.setEmployeeName(employeeContent.getEmployeeName());
                     verificationModel.setCheckTime(System.currentTimeMillis());
-
-
-                    getResultContent().set(orderService2.verification(verificationModel));
+                    ResultContent<SubOrdersConfirmResponseModel> subOrdersConfirmResponseModelResultContent = paymentService2.subOrdersConfirm(verificationModel.getId(), verificationModel.getShopId());
+                    if (subOrdersConfirmResponseModelResultContent.getState().equals(ResultState.Success)) {
+                        getResultContent().set(subOrdersConfirmResponseModelResultContent);
+                        return RepeatStatus.FINISHED;
+                    }
+                    UpdateGoodsModel updateGoodsModel = new UpdateGoodsModel();
+                    updateGoodsModel.setVerifyModel(JSONUtil.parseObj(verificationModel));
+                    getResultContent().set(orderService2.updateGoods(updateGoodsModel));
                     return RepeatStatus.FINISHED;
                 })
                 .build();