.

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

@@ -145,13 +145,43 @@ public class XiaoJuService {
         apiLog.setSystem("xiaoju");
 
         log.info("通知 订单状态：{}", s);
-        NotificationReceiveRefundRequest xiaoJuStore = JSONUtil.toBean(s, NotificationReceiveRefundRequest.class);
+        NotificationOrderInfoRequest notificationOrderInfoRequest = JSONUtil.toBean(s, NotificationOrderInfoRequest.class);
 
-        XiaoJuOrder byOutOrderId = xiaoJuOrderDao.findByOutOrderId(xiaoJuStore.getOutOrderId());
-        BeanUtils.copyProperties(byOutOrderId, xiaoJuStore, "outOrderId");
+        XiaoJuOrder byOutOrderId = xiaoJuOrderDao.findByOutOrderId(notificationOrderInfoRequest.getOutOrderId());
+        BeanUtils.copyProperties(notificationOrderInfoRequest, byOutOrderId);
         xiaoJuOrderDao.save(byOutOrderId);
 
 
+        ResultContent<List<GoodsResultModel>> listResultContent = orderService2.goodsDetail(notificationOrderInfoRequest.getOutOrderId());
+        for (GoodsResultModel goodsResultModel : listResultContent.getContent()) {
+
+            UpdateGoodsModel updateGoodsModel = new UpdateGoodsModel();
+            updateGoodsModel.setId(goodsResultModel.getId());
+            Integer orderStatus = notificationOrderInfoRequest.getOrderStatus();
+            switch (orderStatus) {
+                case 1:
+                    updateGoodsModel.setGoodsState(OrderType.WAIT_PAYMENT);
+                    break;
+                case 2:
+                    updateGoodsModel.setGoodsState(OrderType.USED);
+                    break;
+                case 6:
+                    updateGoodsModel.setGoodsState(OrderType.REFUNDED);
+                    break;
+                case 8:
+                    updateGoodsModel.setGoodsState(OrderType.CLOSE);
+                    break;
+                case 9:
+                    updateGoodsModel.setGoodsState(OrderType.CLOSE);
+                    break;
+
+
+            }
+            orderService2.updateGoods(updateGoodsModel);
+
+
+        }
+
 
         String data = SecurityService.genEncodeData("{\"success\":true,\"msg\":\"ok\"}", oilConfig.getDataSecret(), oilConfig.getDataSecretIV());
         String sig = SecurityService.genSigData(data, oilConfig.getDataSecret());
@@ -395,7 +425,7 @@ public class XiaoJuService {
         JSONObject goodsInfo = JSONUtil.parseObj(queryNewOrderRequest);
         goodsInfo.put("goodsName", byStoreId.getStoreName());
         goodsInfo.put("goodsPath", byStoreId.getLogo());
-        goodsInfo.put("itemName",xiaoJuQueryNewOrderModel.getItemName());
+        goodsInfo.put("itemName", xiaoJuQueryNewOrderModel.getItemName());
         goods.setGoodsInfo(goodsInfo);
         goods.setPayAmount(payment);
         goods.setTransferType(TransferType.RATIO);