优化

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/dal/dataobject/distributorproduct/DistributorAgencyPriceDO.java

@@ -5,7 +5,6 @@ import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 
 import java.math.BigDecimal;
-import java.time.LocalDateTime;
 import java.util.Date;
 
 /**

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/dal/dataobject/tradeOrderaudit/TradeOrderAuditDO.java

@@ -1,5 +1,6 @@
 package com.yc.ship.module.trade.dal.dataobject.tradeOrderaudit;
 
+import com.yc.ship.framework.tenant.core.db.TenantBaseDO;
 import lombok.*;
 import java.util.*;
 import java.time.LocalDateTime;
@@ -22,7 +23,7 @@ import com.yc.ship.framework.mybatis.core.dataobject.BaseDO;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class TradeOrderAuditDO extends BaseDO {
+public class TradeOrderAuditDO extends TenantBaseDO {
 
     /**
      * 主键
@@ -46,6 +47,9 @@ public class TradeOrderAuditDO extends BaseDO {
      * 审核人
      */
     private Long auditUser;
+
+    @TableField(exist = false)
+    private String auditUserName;
     /**
      * 审核时间
      */

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

@@ -2,8 +2,11 @@ package com.yc.ship.module.trade.dal.mysql.order;
 
 
 import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
+import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderUserDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * 订单联系人 Mapper
@@ -12,6 +15,8 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface TradeOrderUserMapper extends BaseMapperX<TradeOrderUserDO> {
-
+    @Update("UPDATE trade_order_user SET deleted = #{deleted},update_time = now() 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

@@ -4,11 +4,13 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import com.yc.ship.framework.mybatis.core.mapper.BaseMapperX;
+import com.yc.ship.framework.tenant.core.aop.TenantIgnore;
 import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeVisitorRespVO;
 import com.yc.ship.module.trade.dal.dataobject.order.TradeVisitorDO;
 import com.yc.ship.module.trade.service.order.bo.TradeVisitorBO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 
 import java.util.Date;
 import java.util.List;
@@ -56,4 +58,8 @@ public interface TradeVisitorMapper extends BaseMapperX<TradeVisitorDO> {
      * @return
      */
     List<TradeVisitorDO> selectListByVoyageId(@Param("voyageId") String voyageId);
+
+    @Update("UPDATE trade_visitor SET deleted = #{deleted},update_time = now() 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/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -164,6 +164,8 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     @Resource
     private TradeOrderMapper tradeOrderMapper;
     @Resource
+    private TradeOrderUserMapper tradeOrderUserMapper;
+    @Resource
     private TradeDetailMapper tradeDetailMapper;
     @Resource
     private TradeDetailBaseMapper tradeDetailBaseMapper;
@@ -608,6 +610,10 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             TradeOrderBindDO bindByOrder = tradeOrderRepositoryService.getBindByOrder(orderId);
             tradeOrderDO.setBindOrder(bindByOrder);
             List<TradeOrderAuditDO> tradeOrderAuditList = tradeOrderAuditMapper.selectNewAuditorByOrderId(orderId);
+            tradeOrderAuditList.forEach(item -> {
+                AdminUserRespDTO user = adminUserApi.getUser(item.getAuditUser());
+                item.setAuditUserName(user != null ? user.getUsername() : "未知");
+            });
             tradeOrderDO.setTradeOrderAuditList(tradeOrderAuditList);
             return CommonResult.success(tradeOrderDO);
         }
@@ -638,6 +644,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             tradeOrderAuditDO.setAuditCurrentStatus(tradeOrderDO.getAuditStatus());
             tradeOrderAuditDO.setOrderNo(tradeOrderDO.getOrderNo());
             tradeOrderAuditDO.setOrderId(tradeOrderDO.getId());
+            tradeOrderAuditDO.setTenantId(tradeOrderDO.getTenantId());
             tradeOrderAuditMapper.insert(tradeOrderAuditDO);
 
             if (tradeOrderDO.getAuditStatus() + 1 >= tradeOrderDO.getAuditType()) {
@@ -671,6 +678,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             tradeOrderAuditDO.setAuditTime(LocalDateTime.now());
             //审核状态 1、通过 2、不通过
             tradeOrderAuditDO.setAuditStatus(2);
+            tradeOrderAuditDO.setTenantId(tradeOrderDO.getTenantId());
             tradeOrderAuditDO.setAuditCurrentStatus(tradeOrderDO.getAuditStatus());
             tradeOrderAuditDO.setOrderNo(tradeOrderDO.getOrderNo());
             tradeOrderAuditDO.setOrderId(tradeOrderDO.getId());
@@ -681,18 +689,20 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 TradeOrderDO lastTradeOrder = tradeOrderDoList.get(0);
                 tradeOrderMapper.updateOrderDeleted(orderId,1);
                 tradeOrderMapper.updateOrderDeleted(lastTradeOrder.getId(),0);
+                tradeOrderUserMapper.updateDeleted(orderId,1);
+                tradeOrderUserMapper.updateDeleted(lastTradeOrder.getId(),0);
                 tradeDetailMapper.updateDeleted(orderId,1);
                 tradeDetailMapper.updateDeleted(lastTradeOrder.getId(),0);
                 tradeDetailBaseMapper.updateDeleted(orderId,1);
                 tradeDetailBaseMapper.updateDeleted(lastTradeOrder.getId(),0);
+                tradeVisitorMapper.updateDeleted(orderId,1);
+                tradeVisitorMapper.updateDeleted(lastTradeOrder.getId(),0);
                 tradeOrderCountryMapper.updateDeleted(orderId,1);
                 tradeOrderCountryMapper.updateDeleted(lastTradeOrder.getId(),0);
                 tradeOrderRoomModelMapper.updateDeleted(orderId,1);
                 tradeOrderRoomModelMapper.updateDeleted(lastTradeOrder.getId(),0);
                 tradeOrderFloorMapper.updateDeleted(orderId,1);
                 tradeOrderFloorMapper.updateDeleted(lastTradeOrder.getId(),0);
-                tradeOrderRoomModelMapper.updateDeleted(orderId,1);
-                tradeOrderRoomModelMapper.updateDeleted(lastTradeOrder.getId(),0);
                 tradeOrderTotalMapper.updateDeleted(orderId,1);
                 tradeOrderTotalMapper.updateDeleted(lastTradeOrder.getId(),0);
                 Map<String, Object> extMap = new HashMap<>();
@@ -719,18 +729,20 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             TradeOrderDO lastTradeOrder = tradeOrderDoList.get(0);
             tradeOrderMapper.updateOrderDeleted(orderId,1);
             tradeOrderMapper.updateOrderDeleted(lastTradeOrder.getId(),0);
+            tradeOrderUserMapper.updateDeleted(orderId,1);
+            tradeOrderUserMapper.updateDeleted(lastTradeOrder.getId(),0);
             tradeDetailMapper.updateDeleted(orderId,1);
             tradeDetailMapper.updateDeleted(lastTradeOrder.getId(),0);
             tradeDetailBaseMapper.updateDeleted(orderId,1);
             tradeDetailBaseMapper.updateDeleted(lastTradeOrder.getId(),0);
+            tradeVisitorMapper.updateDeleted(orderId,1);
+            tradeVisitorMapper.updateDeleted(lastTradeOrder.getId(),0);
             tradeOrderCountryMapper.updateDeleted(orderId,1);
             tradeOrderCountryMapper.updateDeleted(lastTradeOrder.getId(),0);
             tradeOrderRoomModelMapper.updateDeleted(orderId,1);
             tradeOrderRoomModelMapper.updateDeleted(lastTradeOrder.getId(),0);
             tradeOrderFloorMapper.updateDeleted(orderId,1);
             tradeOrderFloorMapper.updateDeleted(lastTradeOrder.getId(),0);
-            tradeOrderRoomModelMapper.updateDeleted(orderId,1);
-            tradeOrderRoomModelMapper.updateDeleted(lastTradeOrder.getId(),0);
             tradeOrderTotalMapper.updateDeleted(orderId,1);
             tradeOrderTotalMapper.updateDeleted(lastTradeOrder.getId(),0);
 
@@ -2128,9 +2140,9 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         BigDecimal realAmount = summary.getRealMoney();
         BigDecimal orderMoney = summary.getOrderMoney();
         Long discountId = summary.getDiscountId();
-        if (orderMoney != null && realAmount != null && realAmount.compareTo(orderMoney) != 0) {
-            shipTradeOrderCreateReqVO.setAmount(orderMoney);
-            shipTradeOrderCreateReqVO.setPayAmount(realAmount);
+        shipTradeOrderCreateReqVO.setAmount(orderMoney);
+        shipTradeOrderCreateReqVO.setPayAmount(realAmount);
+        if ((orderMoney != null && realAmount != null && realAmount.compareTo(orderMoney) != 0) ||!Objects.equals(shipTradeOrderCreateReqVO.getAmount(), tradeOrderDO.getAmount())) {
             shipTradeOrderCreateReqVO.setConfirmType(1);
             TradeOrderBindDO tradeOrderBindDO = new TradeOrderBindDO();
             tradeOrderBindDO.setId(IdWorker.getId());
@@ -2141,8 +2153,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             shipTradeOrderCreateReqVO.setTradeOrderBindDO(tradeOrderBindDO);
         } else {
             shipTradeOrderCreateReqVO.setConfirmType(0);
-            shipTradeOrderCreateReqVO.setAmount(createVO.getSummary().getOrderMoney());
-            shipTradeOrderCreateReqVO.setPayAmount(createVO.getSummary().getRealMoney());
         }
         if (tradeOrderDO.getOrderStatus() == 6) {
             shipTradeOrderCreateReqVO.setConfirmType(1);