定金支付逻辑,订单支付扣减已支付定金金额

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/OtcTradeOrderController.java

@@ -186,6 +186,14 @@ public class OtcTradeOrderController {
         return otcTradeOrderService.queryOrderStatus(orderId);
     }
 
+    @GetMapping("/travl/queryDeposiOrderStatus")
+    @Operation(summary = "win-查询订单定金支付状态")
+    @OperateLog(type = API)
+    @PlatTenantEnv
+    public CommonResult<?> queryDeposiOrderStatus(@RequestParam Long orderId) {
+        return otcTradeOrderService.queryDeposiOrderStatus(orderId);
+    }
+
     @GetMapping("/travl/queryOrderAudit")
     @Operation(summary = "win-查询订单审核信息")
     @OperateLog(type = API)

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

@@ -37,6 +37,8 @@ public interface OtcTradeOrderService {
      */
     CommonResult<?> queryOrderStatus(Long orderId);
 
+    CommonResult<?> queryDeposiOrderStatus(Long orderId);
+
     CommonResult<?> queryOrderAudit(Long orderId);
 
     CommonResult<?> orderAudit(Long orderId, Integer auditStatus);

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

@@ -295,10 +295,19 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     @Override
     public CommonResult<?> queryOrderStatus(Long orderId) {
         TradeOrderDO tradeOrderDO = tradeOrderRepositoryService.getById(orderId);
-        if (tradeOrderDO != null) {
-            return CommonResult.success(tradeOrderDO.getOrderStatus());
+        if (tradeOrderDO != null && tradeOrderDO.getOrderStatus()==6) {
+            return CommonResult.success(orderId);
+        }
+        return CommonResult.error(999,"待轮询");
+    }
+
+    @Override
+    public CommonResult<?> queryDeposiOrderStatus(Long orderId) {
+        TradeOrderDO tradeOrderDO = tradeOrderRepositoryService.getById(orderId);
+        if (tradeOrderDO != null && tradeOrderDO.getDeposiStatus()==2) {
+            return CommonResult.success(orderId);
         }
-        return CommonResult.success(TradeOrderStatusEnum.UNPAID.getStatus());
+        return CommonResult.error(999,"待轮询");
     }
 
     @Override