fix bug

SpringBatchServiceServer/src/main/java/com/zswl/cloud/springBtach/server/core/job/dfy/HotelDeliveryJob.java

@@ -66,7 +66,7 @@ public class HotelDeliveryJob {
                     SubmitOrderRequest submitOrderRequest = new SubmitOrderRequest();
                     submitOrderRequest.setOrderId(bean.getOrderId());
                     submitOrderRequest.setPayType(payType);
-                    submitOrderRequest.setPlatform(payAmount.toString());
+                    submitOrderRequest.setPay(payAmount);
 
                     SubmitOrderResponse submitOrderResponse = domesticHotelApi.submitOrder(submitOrderRequest);
 

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

@@ -199,27 +199,34 @@ public class DfyHotelServiceImpl implements DfyHotelService {
             String orderStatus = orderDetailResponse.getData().getOrderInfo().getOrderStatus();
             switch (orderStatus) {
                 case "已取消":
-                    UpdateOrder2Model updateOrder2Model = new UpdateOrder2Model();
-                    updateOrder2Model.setOrderType(OrderType.CLOSE);
-                    updateOrder2Model.setOrderNo(goodsResultModel.getOrderNo());
-                    orderService2.updateOrderType(updateOrder2Model);
-                    UpdateGoodsModel updateGoodsModel1 = new UpdateGoodsModel();
-                    updateGoodsModel1.setGoodsState(OrderType.CLOSE);
-                    orderService2.updateGoods(updateGoodsModel1);
-                    break;
 
+
+                    switch (goodsResultModel.getGoodsState()) {
+                        case WAIT_PAYMENT:
+                            UpdateOrder2Model updateOrder2Model = new UpdateOrder2Model();
+                            updateOrder2Model.setOrderType(OrderType.CLOSE);
+                            updateOrder2Model.setOrderNo(goodsResultModel.getOrderNo());
+                            orderService2.updateOrderType(updateOrder2Model);
+                            UpdateGoodsModel updateGoodsModel1 = new UpdateGoodsModel();
+                            updateGoodsModel1.setGoodsState(OrderType.CLOSE);
+                            updateGoodsModel1.setId(goodsResultModel.getId());
+                            orderService2.updateGoods(updateGoodsModel1);
+                            break;
+                        case WAIT_USE:
+                            ApplicantRefundParam2Model applicantRefundParam2Model = new ApplicantRefundParam2Model();
+                            applicantRefundParam2Model.setUserId(goodsResultModel.getUserId());
+                            applicantRefundParam2Model.setId(goodsResultModel.getId());
+                            applicantRefundParam2Model.setRemark("渠道服通知取消");
+                            paymentService2.applicantRefund(applicantRefundParam2Model);
+                            break;
+                    }
+                    break;
                 case "已完成":
                     UpdateGoodsModel updateGoodsModel = new UpdateGoodsModel();
                     updateGoodsModel.setGoodsState(OrderType.USED);
+                    updateGoodsModel.setId(goodsResultModel.getId());
                     orderService2.updateGoods(updateGoodsModel);
                     break;
-                case "取消":
-                    ApplicantRefundParam2Model applicantRefundParam2Model = new ApplicantRefundParam2Model();
-                    applicantRefundParam2Model.setUserId(goodsResultModel.getUserId());
-                    applicantRefundParam2Model.setId(goodsResultModel.getId());
-                    applicantRefundParam2Model.setRemark("渠道服通知取消");
-                    paymentService2.applicantRefund(applicantRefundParam2Model);
-                    break;
             }