Jelajahi Sumber

数据更新

gongfuzhu 9 bulan lalu
induk
melakukan
3496a80963

+ 27 - 1
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/impl/OrderServiceImpl.java

@@ -1,6 +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;
@@ -15,6 +16,7 @@ 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.springBatch.client.model.qiuxiang.OrderDelitResponse;
 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.StandarOrderJob;
@@ -36,6 +38,9 @@ import javax.annotation.Resource;
 @Service
 public class OrderServiceImpl implements OrderService {
 
+    @Autowired
+    QiuXiangServiceImpl qiuXiangService;
+
     @Autowired
     private StandarOrderJob standardOrderJob;
 
@@ -157,8 +162,29 @@ public class OrderServiceImpl implements OrderService {
         UserSeachOrder2Model userSeachOrder2Model = new UserSeachOrder2Model();
         BeanUtils.copyProperties(userSeachOrderModel, userSeachOrder2Model);
         userSeachOrder2Model.setUserId(userId);
+        ResultContent<Page<OrderResult2Model>> pageResultContent = orderService2.userSearch(userSeachOrder2Model);
+        pageResultContent.getContent().getContent().forEach(it -> {
+            for (OrderResult2Model.GoodsModel goodsModel : it.getGoodsModelList()) {
+                switch (goodsModel.getJobFlowMap()) {
+                    case QiuXiang:
+                        JSONObject extend = goodsModel.getExtend();
+                        Integer orderStatus = (Integer) extend.get("orderStatus");
+                        if (!orderStatus.equals(2) || !orderStatus.equals(-1)) {
+
+                            ResultContent<OrderDelitResponse> orderId = qiuXiangService.orderDelit(goodsModel.getId());
+                            OrderDelitResponse content = orderId.getContent();
+                            goodsModel.setExtend(JSONUtil.parseObj(content));
+                        }
+
+                        break;
+                }
+
+            }
+
+
+        });
 
-        return orderService2.userSearch(userSeachOrder2Model);
+        return pageResultContent;
     }
 
     public ResultContent goodsDetail(String id) {

+ 4 - 4
SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/service/impl/QiuXiangServiceImpl.java

@@ -33,16 +33,16 @@ import java.util.List;
 public class QiuXiangServiceImpl implements QiuXiangService {
 
     @Autowired
-    OrderService2 orderService2;
+    private OrderService2 orderService2;
 
     @Autowired
-    QiuXiangApi qiuXiangApi;
+    private QiuXiangApi qiuXiangApi;
 
     @Autowired
-    AuthHelper authHelper;
+    private AuthHelper authHelper;
 
     @Autowired
-    ShopService shopService;
+    private ShopService shopService;
 
 
     @Override