quxiao

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

@@ -207,12 +207,19 @@ public class DfyHotelServiceImpl implements DfyHotelService {
                     updateGoodsModel1.setGoodsState(OrderType.CLOSE);
                     orderService2.updateGoods(updateGoodsModel1);
                     break;
+
                 case "已完成":
                     UpdateGoodsModel updateGoodsModel = new UpdateGoodsModel();
                     updateGoodsModel.setGoodsState(OrderType.USED);
                     orderService2.updateGoods(updateGoodsModel);
                     break;
-
+                case "取消":
+                    ApplicantRefundParam2Model applicantRefundParam2Model = new ApplicantRefundParam2Model();
+                    applicantRefundParam2Model.setUserId(goodsResultModel.getUserId());
+                    applicantRefundParam2Model.setId(goodsResultModel.getId());
+                    applicantRefundParam2Model.setRemark("渠道服通知取消");
+                    paymentService2.applicantRefund(applicantRefundParam2Model);
+                    break;
             }
 
 

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

@@ -134,7 +134,7 @@ public class DfyTicketServiceImpl implements DfyTicketService {
         goodsInfo.set("goodsName", detailResponse.getData().getProductName());
         goodsInfo.set("goodsPath", scenicDetailResponse.getData().getDefaultPic());
         goodsInfo.set("scenicId", createOrderNewRequest.getScenicId());
-        goodsInfo.set("salePrice",salePrice);
+        goodsInfo.set("salePrice", salePrice);
 
         CreateOrder2Model.Goods goods = new CreateOrder2Model.Goods();
         goods.setGoodsId(String.valueOf(createOrderNewRequest.getProductId()));
@@ -196,14 +196,27 @@ public class DfyTicketServiceImpl implements DfyTicketService {
 
             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);
+                            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;
+                    }
+
+
+                    return ResultContent.buildContent(orderDetailResponse);
                 case "已完成":
                     UpdateGoodsModel updateGoodsModel = new UpdateGoodsModel();
                     updateGoodsModel.setGoodsState(OrderType.USED);