值船只有小程序订单可以

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/otc/AppOtcTradeOrderController.java

@@ -196,8 +196,7 @@ public class AppOtcTradeOrderController {
     @PreAuthenticated
     @OperateLog(type = API)
     public CommonResult<Boolean> checkInRoom(@Valid @RequestBody AppCheckInRoomVO reqVO) {
-        appOtcTradeOrderService.appCheckInRoom(reqVO);
-        return success(true);
+        return appOtcTradeOrderService.appCheckInRoom(reqVO);
     }
 
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/app/otc/vo/AppMyItineraryVO.java

@@ -12,6 +12,9 @@ public class AppMyItineraryVO {
     @Schema(description = "订单id")
     private Long orderId;
 
+    @Schema(description = "订单id")
+    private Integer sellMethod;
+
     @Schema(description = "订单编号")
     private String orderNo;
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/AppOtcTradeOrderService.java

@@ -62,5 +62,5 @@ public interface AppOtcTradeOrderService {
      */
     Long appCreateOrderJzDetail(AppOrderJzReqVO reqVO);
 
-    void appCheckInRoom(AppCheckInRoomVO reqVO);
+    CommonResult<Boolean> appCheckInRoom(AppCheckInRoomVO reqVO);
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/AppOtcTradeOrderServiceImpl.java

@@ -62,6 +62,7 @@ import java.util.*;
 import java.util.concurrent.TimeUnit;
 
 import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUserNickname;
+import static com.yc.ship.module.trade.enums.ErrorCodeConstants.GET_LOCK_EXCEPTION;
 import static com.yc.ship.module.trade.enums.ErrorCodeConstants.ORDER_PAY_TENAND_FAIL;
 
 
@@ -429,7 +430,7 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void appCheckInRoom(AppCheckInRoomVO reqVO) {
+    public CommonResult<Boolean> appCheckInRoom(AppCheckInRoomVO reqVO) {
         Long orderId = reqVO.getOrderId();
         Long voyageId = reqVO.getVoyageId();
         Long roomModelId = reqVO.getRoomModelId();
@@ -437,6 +438,12 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
         Long roomId = reqVO.getRoomId();
         Long visitorId = reqVO.getVisitorId();
         TradeOrderRespVO orderInfo = otcTradeOrderService.getOrderInfo(orderId);
+        if(orderInfo==null){
+            return CommonResult.error(500,"订单不存在");
+        }
+        if(orderInfo.getSellMethod().equals(SellMethodEnum.MINI_APP.getType())){
+            return CommonResult.error(500,"只有小程序订单可以进行此操作");
+        }
         VoyageStockRoomUsedDO voyageStockRoomUsedDO = new VoyageStockRoomUsedDO();
         voyageStockRoomUsedDO.setOrderId(orderId);
         voyageStockRoomUsedDO.setVoyageId(voyageId);
@@ -450,6 +457,7 @@ public class AppOtcTradeOrderServiceImpl implements AppOtcTradeOrderService {
         tradeVisitorDO.setId(visitorId);
         tradeVisitorDO.setRoomId(String.valueOf(roomId));
         tradeVisitorMapper.updateById(tradeVisitorDO);
+        return CommonResult.success(true);
     }
 
 }

ship-module-trade/ship-module-trade-biz/src/main/resources/mapper/order/TradeOrderMapper.xml

@@ -2845,6 +2845,7 @@
         SELECT
             t1.id order_id,
             t1.order_no,
+            t1.sell_method,
             t1.ship_id,
             t4.name ship_name,
             t1.voyage_id,