定金以及新增审阅时间 order新增read_time、deposi字段

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

@@ -86,6 +86,9 @@ public class ShipTradeOrderCreateReqVO implements Serializable {
     @Schema(description = "订单总额")
     private BigDecimal realMoney;
 
+    @Schema(description = "定金")
+    private BigDecimal deposi;
+
     @Schema(description = "实际总额")
     private BigDecimal realOrderMoney;
 

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

@@ -435,6 +435,12 @@ public class TradeOrderPdaRespVO {
     @Schema(description = "审阅人名称")
     private String readUserName;
 
+    @Schema(description = "审阅时间")
+    private LocalDateTime readTime;
+
+    @Schema(description = "定金")
+    private BigDecimal deposi;
+
     @Schema(description = "排序")
     private Integer orderSort;
 

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

@@ -199,4 +199,10 @@ public class TradeOrderRespNewVO {
     @Schema(description = "审阅人名称")
     private String readUserName;
 
+    @Schema(description = "审阅时间")
+    private LocalDateTime readTime;
+
+    @Schema(description = "定金")
+    private BigDecimal deposi;
+
 }

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

@@ -515,6 +515,12 @@ public class TradeOrderRespVO {
     @Schema(description = "审阅人名称")
     private String readUserName;
 
+    @Schema(description = "审阅时间")
+    private LocalDateTime readTime;
+
+    @Schema(description = "定金")
+    private BigDecimal deposi;
+
     @Schema(description = "订单序号")
     private Integer orderSort;
 

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

@@ -114,4 +114,7 @@ public class TradeOrderTotalVO {
 
     @Schema(description = "其它费用说明")
     private String otherRemark;
+
+    @Schema(description = "定金")
+    private BigDecimal deposi;
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/dataobject/order/TradeOrderDO.java

@@ -325,6 +325,16 @@ public class TradeOrderDO extends TenantBaseDO {
      */
     private Long readUser;
 
+    /**
+     * 审阅时间
+     */
+    private LocalDateTime readTime;
+
+    /**
+     * 定金
+     */
+    private BigDecimal deposi;
+
     /**
      * 排序
      */

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/TradeOrderServiceImpl.java

@@ -493,6 +493,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         tradeOrderDO.setLinkMan(orderCreateReqDTO.getLinkMan());
         tradeOrderDO.setLinkMobile(orderCreateReqDTO.getLinkMobile());
         tradeOrderDO.setLinkEmail(orderCreateReqDTO.getLinkEmail());
+        tradeOrderDO.setDeposi(orderCreateReqDTO.getDeposi());
         //设置团散类型
         if (tradeOrderDO.getVisitorType() == null) {
             if (tradeOrderDO.getSellMethod() == 7 || tradeOrderDO.getSellMethod() == 1) {

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

@@ -1378,6 +1378,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             }
             shipTradeOrderCreateReqVO.setRealMoney(realAmount);
             shipTradeOrderCreateReqVO.setIsRead(0);
+            shipTradeOrderCreateReqVO.setDeposi(createVO.getSummary().getDeposi());
             shipTradeOrderCreateReqVO.setOrderSort(maxOrderNo+1);
             shipTradeOrderCreateReqVO.setOtherMoney(otherMoney);
 
@@ -1569,6 +1570,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             shipTradeOrderCreateReqVO.setGroupNo(createVO.getGroupNo());
             shipTradeOrderCreateReqVO.setTravelDate(tradeOrderDO.getTravelDate());
             shipTradeOrderCreateReqVO.setOrderId(orderId);
+            shipTradeOrderCreateReqVO.setDeposi(createVO.getSummary().getDeposi());
             shipTradeOrderCreateReqVO.setOrderSort(tradeOrderDO.getOrderSort());
             shipTradeOrderCreateReqVO.setIsRead(0);
             TradeOrderTotalVO summary = createVO.getSummary();
@@ -2072,6 +2074,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         tradeOrderMapper.update(new LambdaUpdateWrapper<TradeOrderDO>()
                 .set(TradeOrderDO::getIsRead, 1)
                 .set(TradeOrderDO::getReadUser, userId)
+                .set(TradeOrderDO::getReadTime, LocalDateTime.now())
                 .eq(TradeOrderDO::getId, orderId));
         return CommonResult.success(orderId);
     }