核销

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

@@ -3,13 +3,13 @@ package com.zswl.cloud.springBtach.server.core.job.standard;
 import cn.hutool.json.JSONObject;
 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.CreateOrder2Model;
 import com.zhongshu.payment.client.model.order.v2.GoodsResultModel;
 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;
+import com.zswl.cloud.shop.client.vo.life.EmployeeDetailVo;
+import com.zswl.cloud.shop.client.vo.life.ShopDetailVo;
 import lombok.Data;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.batch.core.Job;
@@ -46,18 +46,18 @@ public class StandarVerificationJob {
     @Autowired
     OrderService2 orderService2;
 
+
     @Autowired
-    AuthHelper authHelper;
+    ShopService shopService;
 
 
     public Step standardVerificationStep() {
         return stepBuilderFactory.get("standardVerificationStep")
                 .tasklet((contribution, chunkContext) -> {
-
                     getResultContent().remove();
 
                     VerificationModel verificationModel = getParameter().get();
-                    String enterPriseId = authHelper.getEnterPriseId();
+                    String enterPriseId = verificationModel.getShopId();
 
                     ResultContent<GoodsResultModel> result = orderService2.qrGoods(verificationModel.getId());
                     if (!result.getState().equals(ResultState.Success)) {
@@ -87,6 +87,16 @@ public class StandarVerificationJob {
                             break;
                     }
 
+
+                    com.zswl.cloud.shop.client.ret.ResultContent<EmployeeDetailVo> employee = shopService.getEmployee(verificationModel.getUserId());
+                    EmployeeDetailVo employeeContent = employee.getContent();
+                    com.zswl.cloud.shop.client.ret.ResultContent<ShopDetailVo> detail = shopService.detail(enterPriseId);
+                    ShopDetailVo shopDetailVo = detail.getContent();
+                    verificationModel.setShopName(shopDetailVo.getShopName());
+                    verificationModel.setEmployeeName(employeeContent.getEmployeeName());
+                    verificationModel.setCheckTime(System.currentTimeMillis());
+
+
                     getResultContent().set(orderService2.verification(verificationModel));
                     return RepeatStatus.FINISHED;
                 })

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

@@ -12,6 +12,8 @@ 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.shop.client.service.ShopService;
+import com.zswl.cloud.shop.client.vo.life.ShopDetailVo;
 import com.zswl.cloud.springBtach.server.core.api.video.YqdCreateRequestModel;
 import com.zswl.cloud.springBtach.server.core.api.video.YqdServiceImpl;
 import com.zswl.cloud.springBtach.server.core.job.standard.StandarDeliveryJob;
@@ -49,6 +51,9 @@ public class VideoDeliveryJob {
     @Autowired
     YqdServiceImpl yqdServiceImpl;
 
+    @Autowired
+    ShopService shopService;
+
 
     public Step videoDeliveryStep() {
         return getStepBuilderFactory().get("videoDeliveryStep")
@@ -83,11 +88,18 @@ public class VideoDeliveryJob {
                         return RepeatStatus.FINISHED;
                     }
 
+                    com.zswl.cloud.shop.client.ret.ResultContent<ShopDetailVo> detail = shopService.detail(goodsResultModel.getShopId());
 
                     VerificationModel verificationModel = new VerificationModel();
                     verificationModel.setId(goodsResultModel.getId());
                     verificationModel.setShopId(goodsResultModel.getShopId());
-                    verificationModel.setVerification(new JSONObject());
+                    verificationModel.setShopName(detail.getContent().getShopName());
+                    verificationModel.setCheckTime(System.currentTimeMillis());
+                    verificationModel.setEmployeeName("系统");
+                    Object goodsName = JSONUtil.parseObj(goodsResultModel.getGoodsInfo()).get("goodsName");
+                    verificationModel.setGoodsName(String.valueOf(goodsName));
+
+
                     String extend = goodsResultModel.getExtend();
                     JSONObject entries1 = JSONUtil.parseObj(extend);
                     entries1.set("create", yqdServiceImpl2.getContent());

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/impl/OrderServiceImpl.java

@@ -1,7 +1,7 @@
 package com.zswl.cloud.springBtach.server.core.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
-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.github.microservice.auth.security.helper.AuthHelper;
@@ -14,12 +14,10 @@ import com.zhongshu.payment.client.type.JobFlowMap;
 import com.zhongshu.payment.client.type.JobFlowType;
 import com.zhongshu.payment.client.type.OrderType;
 import com.zswl.cloud.shop.client.service.ShopService;
-import com.zswl.cloud.shop.client.vo.life.EmployeeDetailVo;
-import com.zswl.cloud.shop.client.vo.life.ShopDetailVo;
 import com.zswl.cloud.springBatch.client.service.OrderService;
 import com.zswl.cloud.springBtach.server.core.helper.RedisHelper;
-import com.zswl.cloud.springBtach.server.core.job.standard.StandarVerificationJob;
 import com.zswl.cloud.springBtach.server.core.job.standard.StandarOrderJob;
+import com.zswl.cloud.springBtach.server.core.job.standard.StandarVerificationJob;
 import lombok.SneakyThrows;
 import org.springframework.batch.core.Job;
 import org.springframework.batch.core.JobParameters;
@@ -127,30 +125,17 @@ public class OrderServiceImpl implements OrderService {
         String enterPriseId = authHelper.getEnterPriseId();
 
         VerificationModel verificationModel = new VerificationModel();
-
-        // todo 构建核销的商家信息
-        JSONObject entries = new JSONObject();
-
-
-        com.zswl.cloud.shop.client.ret.ResultContent<EmployeeDetailVo> employee = shopService.getEmployee(authHelper.getCurrentUser().getUserId());
-        EmployeeDetailVo employeeContent = employee.getContent();
-        com.zswl.cloud.shop.client.ret.ResultContent<ShopDetailVo> detail = shopService.detail(enterPriseId);
-        ShopDetailVo shopDetailVo = detail.getContent();
-        entries.set("shopName", shopDetailVo.getShopName());
-        entries.set("employeeName", employeeContent.getEmployeeName());
-
-        verificationModel.setVerification(entries);
-        verificationModel.setId((String) id);
+        verificationModel.setUserId(authHelper.getCurrentUser().getUserId());
         verificationModel.setShopId(enterPriseId);
+        verificationModel.setId(String.valueOf(id));
 
         ResultContent<GoodsResultModel> goodsResultModelResultContent = orderService2.qrGoods(String.valueOf(id));
         if (!goodsResultModelResultContent.getState().equals(ResultState.Success)) {
-
             return goodsResultModelResultContent;
-
         }
         GoodsResultModel content = goodsResultModelResultContent.getContent();
-
+        Object goodsName = JSONUtil.parseObj(content.getGoodsInfo()).get("goodsName");
+        verificationModel.setGoodsName(String.valueOf(goodsName));
         JobFlowMap jobFlowMap = content.getJobFlowMap();
         String jobName = jobFlowMap.getJobMapping().get(JobFlowType.Verification);
         ThreadLocal<VerificationModel> parameter = standarVerificationJob.getParameter();