bug修复

src/main/java/com/chuanghai/ihotel/component/PayComponent.java

@@ -70,14 +70,14 @@ public class PayComponent {
         // "status":"1","timestamp":"1629255539", "amount": ""}
         boolean isHandleSuccess = false;
         if (verifySign) {
-            String orderNo = params.get("out_no");
+            Long orderId = Long.valueOf(params.get("out_no"));
             String status = params.get("status");
             String amount = params.get("amount"); // 分
 
             if ("1".equals(status)) {
                 isHandleSuccess = true;
                 String realPayAmount = new BigDecimal(amount).divide(new BigDecimal(100)).setScale(2, BigDecimal.ROUND_UP).toString(); // 分转成元
-                hotelOrderService.orderPaySuccess(null, orderNo, realPayAmount, null);
+                hotelOrderService.orderPaySuccess(orderId, null, realPayAmount, null);
             }
         }
 

src/main/java/com/chuanghai/ihotel/controller/HotelOrderController.java

@@ -235,20 +235,6 @@ public class HotelOrderController {
         return CommonResult.ok().setResult(orderBillHandleVO);
     }
 
-    // 办理续住
-
-
-    /**
-     * 信息
-     */
-    @GetMapping("/info/{id}")
-    public CommonResult<HotelOrderEntity> info(@PathVariable("id") Long id){
-		HotelOrderEntity hotelOrder = hotelOrderService.getById(id);
-
-        return CommonResult.ok().setResult(hotelOrder);
-    }
-
-
     /**
      * 时间校验
      * @param startTime

src/main/java/com/chuanghai/ihotel/controller/RoomRealtimeStatuController.java

@@ -61,5 +61,4 @@ public class RoomRealtimeStatuController {
         List<RoomRealDataStatuVO> realData = roomRealtimeStatuService.realData(request);
         return CommonResult.ok().setResult(realData);
     }
-
 }

src/main/java/com/chuanghai/ihotel/controller/TestController.java

@@ -3,6 +3,7 @@ package com.chuanghai.ihotel.controller;
 import com.chuanghai.ihotel.component.DoorLockComponent;
 import com.chuanghai.ihotel.component.WaterElectricComponent;
 import com.chuanghai.ihotel.dto.DoorLockAddPasswordRequestDTO;
+import com.chuanghai.ihotel.service.HotelOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,6 +28,8 @@ public class TestController {
     WaterElectricComponent waterElectricComponent;
     @Autowired
     DoorLockComponent doorLockComponent;
+    @Autowired
+    private HotelOrderService orderService;
 
     @GetMapping("test1")
     public void test1() {
@@ -69,4 +72,9 @@ public class TestController {
     public void test6() {
         doorLockComponent.deleteLockUser("80A036D93CFB", "c7e634f560954849811f1001b6174e29");
     }
+
+    @GetMapping("test7")
+    private void test7(Long orderId, String realAmount) {
+        orderService.orderPaySuccess(orderId, null, realAmount, null);
+    }
 }

src/main/java/com/chuanghai/ihotel/service/impl/HotelOrderServiceImpl.java

@@ -323,7 +323,7 @@ public class HotelOrderServiceImpl extends ServiceImpl<HotelOrderDao, HotelOrder
         rabbitTemplate.convertAndSend(rabbitMQConfig.getOrderEventExchange(), rabbitMQConfig.getOrderCloseDelayRoutingKey(), eventMessage);
 
         // 返回支付参数
-        String payUrl = String.format(jxnxsPayConfig.getPayUrl(), hotelOrder.getOrderNo(), request.getPayAmount());
+        String payUrl = String.format(jxnxsPayConfig.getPayUrl(), hotelOrder.getId(), request.getPayAmount());
         return OrderSubmitVO.builder().orderId(hotelOrder.getId()).payUrl(payUrl).build();
     }
 
@@ -436,7 +436,7 @@ public class HotelOrderServiceImpl extends ServiceImpl<HotelOrderDao, HotelOrder
         }
 
         // 支付参数
-        String payUrl = String.format(jxnxsPayConfig.getPayUrl(), orderEntity.getOrderNo(), orderEntity.getPayAmount());
+        String payUrl = String.format(jxnxsPayConfig.getPayUrl(), orderEntity.getId(), orderEntity.getPayAmount());
         return OrderSubmitVO.builder().orderId(orderId).payUrl(payUrl).build();
     }
 
@@ -465,13 +465,13 @@ public class HotelOrderServiceImpl extends ServiceImpl<HotelOrderDao, HotelOrder
     public void userCancelOrder(Long orderId) {
         HotelOrderEntity order = userGetOrderById(orderId);
 
-        // 已取消、待支付、已完成订单才可以被删除
+        // 待支付订单才可以被取消
         if (!OrderStatuEnum.WAIT_PAY.getCode().equalsIgnoreCase(order.getOrderStatu())) {
             throw new RRException(BizCodeEnume.PERMISSION_DENIED, "当前订单不可取消");
         }
         UpdateWrapper<HotelOrderEntity> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", orderId);
-        updateWrapper.set("order_statu", OrderStatuEnum.WAIT_PAY.getCode());
+        updateWrapper.set("order_statu", OrderStatuEnum.CANCEL.getCode());
         updateWrapper.last("limit 1");
         this.update(null, updateWrapper);
     }

src/main/resources/application.yml

@@ -68,7 +68,7 @@ jxnxs:
   openId: 74969401869b175660817b4369e5a911
   openKey: ba5c30ce48fbfb4464a5a855a960c802
   shopPass: ""
-  notifyUrl: http://chuanghai-dev.natappfree.cc/pay/jxnxs/notify
+  notifyUrl: http://chuanghai-dev.natapp1.cc/ihotel/pay/jxnxs/notify
   payUrl: https://q.jxnxs.com/newpay?O=${jxnxs.openId}&out_no=%s&amount=%s&appoint_notify=${jxnxs.notifyUrl}
 
 # 前端服务地址