Merge branch 'main' of http://47.98.207.247:3000/lsq/ship-ota-server

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

@@ -2,6 +2,7 @@ package com.yc.ship.module.trade.dal.dataobject.order;
 
 import com.baomidou.mybatisplus.annotation.*;
 
+import com.yc.ship.framework.mybatis.core.dataobject.TenantSyncDO;
 import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
 import com.yc.ship.module.trade.enums.VoucherStatusEnum;
 import lombok.*;
@@ -22,7 +23,7 @@ import java.time.LocalDateTime;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class TradeDetailDO extends TenantBaseDO {
+public class TradeDetailDO extends TenantSyncDO {
 
     /**
      * 主键

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

@@ -1,5 +1,6 @@
 package com.yc.ship.module.trade.dal.dataobject.order;
 
+import com.yc.ship.framework.mybatis.core.dataobject.TenantSyncDO;
 import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.*;
@@ -22,7 +23,7 @@ import com.yc.ship.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class TradeOrderCountryDO extends TenantBaseDO {
+public class TradeOrderCountryDO extends TenantSyncDO {
 
     /**
      * ID

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

@@ -2,6 +2,7 @@ package com.yc.ship.module.trade.dal.dataobject.order;
 
 import com.baomidou.mybatisplus.annotation.*;
 
+import com.yc.ship.framework.mybatis.core.dataobject.TenantSyncDO;
 import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
 import com.yc.ship.module.trade.dal.dataobject.tradeOrderaudit.TradeOrderAuditDO;
 import com.yc.ship.module.trade.enums.SellMethodEnum;
@@ -28,7 +29,7 @@ import java.util.List;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class TradeOrderDO extends TenantBaseDO {
+public class TradeOrderDO extends TenantSyncDO {
 
     /**
      * 主键

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

@@ -1,5 +1,6 @@
 package com.yc.ship.module.trade.dal.dataobject.order;
 
+import com.yc.ship.framework.mybatis.core.dataobject.TenantSyncDO;
 import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 import java.util.*;
@@ -23,7 +24,7 @@ import com.yc.ship.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class TradeOrderFloorDO extends TenantBaseDO {
+public class TradeOrderFloorDO extends TenantSyncDO {
 
     /**
      * ID

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

@@ -1,5 +1,6 @@
 package com.yc.ship.module.trade.dal.dataobject.order;
 
+import com.yc.ship.framework.mybatis.core.dataobject.TenantSyncDO;
 import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
@@ -21,7 +22,7 @@ import com.yc.ship.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class TradeOrderRoomModelDO extends TenantBaseDO {
+public class TradeOrderRoomModelDO extends TenantSyncDO {
 
     /**
      * ID

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

@@ -1,5 +1,6 @@
 package com.yc.ship.module.trade.dal.dataobject.order;
 
+import com.yc.ship.framework.mybatis.core.dataobject.TenantSyncDO;
 import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
 import com.yc.ship.module.trade.framework.annotation.ForUpdate;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -23,7 +24,7 @@ import com.yc.ship.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class TradeOrderTotalDO extends TenantBaseDO {
+public class TradeOrderTotalDO extends TenantSyncDO {
 
     /**
      * 订单ID

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
+import com.yc.ship.framework.mybatis.core.dataobject.TenantSyncDO;
 import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
 import com.yc.ship.module.trade.enums.CredentialTypeEnum;
 import lombok.*;
@@ -22,7 +23,7 @@ import lombok.*;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class TradeOrderUserDO extends TenantBaseDO {
+public class TradeOrderUserDO extends TenantSyncDO {
 
     /**
      * 主键

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 
+import com.yc.ship.framework.mybatis.core.dataobject.TenantSyncDO;
 import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
 import com.yc.ship.module.trade.enums.CredentialTypeEnum;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -25,7 +26,7 @@ import java.math.BigDecimal;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class TradeVisitorDO extends TenantBaseDO {
+public class TradeVisitorDO extends TenantSyncDO {
 
     /**
      * 主键

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/mysql/order/TradeOrderFloorMapper.java

@@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Update;
  */
 @Mapper
 public interface TradeOrderFloorMapper extends BaseMapperX<TradeOrderFloorDO> {
-    @Update("UPDATE trade_order_floor SET deleted = #{deleted},update_time = now() WHERE order_id = #{orderId}")
+    @Update("UPDATE trade_order_floor SET deleted = #{deleted},update_time = now(), sync_status = '0' WHERE order_id = #{orderId}")
     @TenantIgnore
     void updateDeleted(@Param("orderId") Long orderId, @Param("deleted")  int deleted);
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/mysql/order/TradeOrderRoomModelMapper.java

@@ -33,7 +33,7 @@ public interface TradeOrderRoomModelMapper extends BaseMapperX<TradeOrderRoomMod
                 .eq(TradeOrderRoomModelDO::getOrderId, orderId));
     }
 
-    @Update("UPDATE trade_order_room_model SET deleted = #{deleted},update_time = now() WHERE order_id = #{orderId}")
+    @Update("UPDATE trade_order_room_model SET deleted = #{deleted},update_time = now(), sync_status = '0' WHERE order_id = #{orderId}")
     @TenantIgnore
     void updateDeleted(@Param("orderId") Long orderId, @Param("deleted")  int deleted);
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/mysql/order/TradeOrderTotalMapper.java

@@ -29,7 +29,7 @@ public interface TradeOrderTotalMapper extends BaseMapperX<TradeOrderTotalDO> {
                 .inIfPresent(TradeOrderTotalDO::getOldOrderId, orderIds));
     }
 
-    @Update("UPDATE trade_order_total SET deleted = #{deleted},update_time = now() WHERE old_order_id = #{orderId}")
+    @Update("UPDATE trade_order_total SET deleted = #{deleted},update_time = now(), sync_status = '0' WHERE old_order_id = #{orderId}")
     @TenantIgnore
     void updateDeleted(@Param("orderId") Long orderId, @Param("deleted")  int deleted);
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/mysql/order/TradeOrderUserMapper.java

@@ -15,7 +15,7 @@ import org.apache.ibatis.annotations.Update;
  */
 @Mapper
 public interface TradeOrderUserMapper extends BaseMapperX<TradeOrderUserDO> {
-    @Update("UPDATE trade_order_user SET deleted = #{deleted},update_time = now() WHERE order_id = #{orderId}")
+    @Update("UPDATE trade_order_user SET deleted = #{deleted},update_time = now(), sync_status = '0' WHERE order_id = #{orderId}")
     @TenantIgnore
     void updateDeleted(@Param("orderId") Long orderId, @Param("deleted")  int deleted);
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/mysql/order/TradeVisitorMapper.java

@@ -72,7 +72,7 @@ public interface TradeVisitorMapper extends BaseMapperX<TradeVisitorDO> {
      */
     List<TradeVisitorDO> selectListByVoyageId(@Param("voyageId") String voyageId);
 
-    @Update("UPDATE trade_visitor SET deleted = #{deleted},update_time = now() WHERE order_id = #{orderId}")
+    @Update("UPDATE trade_visitor SET deleted = #{deleted},update_time = now(), sync_status = '0' WHERE order_id = #{orderId}")
     @TenantIgnore
     void updateDeleted(@Param("orderId") Long orderId, @Param("deleted")  int deleted);
 

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

@@ -1438,6 +1438,6 @@
     </select>
 
     <update id="updateDeleted">
-        UPDATE trade_detail SET deleted = #{deleted},update_time = now() WHERE order_id = #{orderId}
+        UPDATE trade_detail SET deleted = #{deleted},update_time = now(), sync_status = '0' WHERE order_id = #{orderId}
     </update>
 </mapper>

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

@@ -1502,15 +1502,15 @@
     </select>
 
     <update id="updateOrderStatus">
-        UPDATE trade_order SET order_status = #{orderStatus} WHERE id = #{orderId} and order_status != #{orderStatus}
+        UPDATE trade_order SET order_status = #{orderStatus}, sync_status = '0' WHERE id = #{orderId} and order_status != #{orderStatus}
     </update>
 
     <update id="updateOrderIsAccount">
-        UPDATE trade_order SET is_account = #{isAccount} WHERE id = #{orderId}
+        UPDATE trade_order SET is_account = #{isAccount} , sync_status = '0' WHERE id = #{orderId}
     </update>
 
     <update id="updateOrderDeleted">
-        UPDATE trade_order SET deleted = #{deleted},update_time = now() WHERE id = #{orderId}
+        UPDATE trade_order SET deleted = #{deleted},update_time = now(), sync_status = '0' WHERE id = #{orderId}
     </update>
 
     <resultMap id="OrderAndDetailResultMap" type="com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderPdaRespVO">