优化

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

@@ -178,4 +178,13 @@ public class TradeOrderRespNewVO {
     @Schema(description = "房型信息")
     private List<TradeOrderRoomModelVO> roomModelList;
 
+    @Schema(description = "审核人")
+    @ExcelProperty("审核人")
+    private String auditUser;
+
+    @Schema(description = "审核时间")
+    @ExcelProperty("审核时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
+    private LocalDateTime auditTime;
+
 }

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

@@ -489,5 +489,14 @@ public class TradeOrderRespVO {
     @Schema(description = "房型信息")
     private List<TradeOrderRoomModelVO> roomModelList;
 
+    @Schema(description = "审核人")
+    @ExcelProperty("审核人")
+    private String auditUser;
+
+    @Schema(description = "审核时间")
+    @ExcelProperty("审核时间")
+    @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
+    private LocalDateTime auditTime;
+
 
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/orderjzdetail/vo/OrderJzDetailRespVO.java

@@ -27,7 +27,7 @@ public class OrderJzDetailRespVO {
 
     @Schema(description = "抵达时间")
     @ExcelProperty("抵达时间")
-    private LocalDateTime arriveTime;
+    private String arriveTime;
 
     @Schema(description = "接站地址")
     @ExcelProperty("接站地址")

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

@@ -40,7 +40,7 @@ public interface TradeOrderRepositoryService {
      */
     void saveOrder(TradeOrderBO tradeOrderBO);
 
-    void modifyOrder(TradeOrderBO tradeOrderBO,Long oldOrderId);
+    void modifyOrder(TradeOrderBO tradeOrderBO,TradeOrderDO oldOrder);
 
     /**
      * 更新订单状态

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

@@ -142,64 +142,32 @@ public class TradeOrderRepositoryServiceImpl implements TradeOrderRepositoryServ
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void modifyOrder(TradeOrderBO tradeOrderBO,Long oldOrderId) {
+    public void modifyOrder(TradeOrderBO tradeOrderBO,TradeOrderDO oldOrder) {
         try {
-
+            Long oldOrderId = oldOrder.getId();
             tradeOrderMapper.updateOrderDeleted(oldOrderId,1);
-            tradeOrderMapper.insert(tradeOrderBO.getTradeOrderDO());
+            TradeOrderDO tradeOrderDO = tradeOrderBO.getTradeOrderDO();
+            tradeOrderDO.setCreateTime(oldOrder.getCreateTime());
+            tradeOrderDO.setUpdateTime(LocalDateTime.now());
+            tradeOrderMapper.insert(tradeOrderDO);
 
-            orderJzMapper.delete(new LambdaUpdateWrapper<OrderJzDO>().eq(OrderJzDO::getOrderId, oldOrderId));
             orderJzMapper.insert(tradeOrderBO.getOrderJzDO());
 
             tradeOrderBindMapper.update(new LambdaUpdateWrapper<TradeOrderBindDO>().set(TradeOrderBindDO::getDeleted, 1).set(TradeOrderBindDO::getUpdateTime, tradeOrderBO.getUpdateTime()==null?new Date():tradeOrderBO.getUpdateTime()).eq(TradeOrderBindDO::getOrderId, oldOrderId));
             if (tradeOrderBO.getTradeOrderBindDO() != null) {
                 tradeOrderBindMapper.insert(tradeOrderBO.getTradeOrderBindDO());
             }
-
-            tradeOrderUserMapper.update(new LambdaUpdateWrapper<TradeOrderUserDO>().set(TradeOrderUserDO::getDeleted, 1).set(TradeOrderUserDO::getUpdateTime, tradeOrderBO.getUpdateTime()==null?new Date():tradeOrderBO.getUpdateTime()).eq(TradeOrderUserDO::getOrderId, oldOrderId));
+            tradeOrderUserMapper.updateDeleted(oldOrderId,1);
             tradeOrderUserMapper.insert(tradeOrderBO.getTradeOrderUserDO());
 
-            if (tradeOrderBO.getTradeOrderDeliveryDO() != null) {
-                tradeOrderDeliveryMapper.update(new LambdaUpdateWrapper<TradeOrderDeliveryDO>()
-                        .set(TradeOrderDeliveryDO::getDeleted, 1)
-                        .set(TradeOrderDeliveryDO::getUpdateTime, tradeOrderBO.getUpdateTime()==null?new Date():tradeOrderBO.getUpdateTime())
-                        .eq(TradeOrderDeliveryDO::getOrderId, oldOrderId)
-                );
-                tradeOrderDeliveryMapper.insert(tradeOrderBO.getTradeOrderDeliveryDO());
-            }
-
             tradeOrderBO.getTradeOrderDetailBOList().forEach(tradeOrderDetailBO -> {
-                tradeDetailMapper.update(new LambdaUpdateWrapper<TradeDetailDO>()
-                        .set(TradeDetailDO::getDeleted, 1)
-                        .set(TradeDetailDO::getUpdateTime, tradeOrderBO.getUpdateTime()==null?new Date():tradeOrderBO.getUpdateTime())
-                        .eq(TradeDetailDO::getOrderId, oldOrderId)
-                );
+                tradeDetailMapper.updateDeleted(oldOrderId,1);
                 tradeDetailMapper.insertBatch(tradeOrderDetailBO.getTradeDetailDOList());
-
-
-                tradeDetailBaseMapper.update(new LambdaUpdateWrapper<TradeDetailBaseDO>()
-                        .set(TradeDetailBaseDO::getDeleted, 1)
-                        .set(TradeDetailBaseDO::getUpdateTime, tradeOrderBO.getUpdateTime()==null?new Date():tradeOrderBO.getUpdateTime())
-                        .eq(TradeDetailBaseDO::getOrderId, oldOrderId)
-                );
+                tradeDetailBaseMapper.updateDeleted(oldOrderId,1);
                 tradeDetailBaseMapper.insertBatch(tradeOrderDetailBO.getTradeDetailBaseDOList());
-
-
-                tradeVisitorMapper.update(new LambdaUpdateWrapper<TradeVisitorDO>()
-                        .set(TradeVisitorDO::getDeleted, 1)
-                        .set(TradeVisitorDO::getUpdateTime, tradeOrderBO.getUpdateTime()==null?new Date():tradeOrderBO.getUpdateTime())
-                        .eq(TradeVisitorDO::getOrderId, oldOrderId)
-                );
+                tradeVisitorMapper.updateDeleted(oldOrderId,1);
                 tradeVisitorMapper.insertBatch(tradeOrderDetailBO.getTradeVisitorDOList());
 
-                if (tradeOrderDetailBO.getTradeOrderHotelDO() != null) {
-                    tradeOrderHotelMapper.update(new LambdaUpdateWrapper<TradeOrderHotelDO>()
-                            .set(TradeOrderHotelDO::getDeleted, 1)
-                            .set(TradeOrderHotelDO::getUpdateTime, tradeOrderBO.getUpdateTime()==null?new Date():tradeOrderBO.getUpdateTime())
-                            .eq(TradeOrderHotelDO::getOrderId, oldOrderId)
-                    );
-                    tradeOrderHotelMapper.insert(tradeOrderDetailBO.getTradeOrderHotelDO());
-                }
                 if (CollUtil.isNotEmpty(tradeOrderDetailBO.getTradeDetailPriceDOList())) {
                     tradeDetailPriceMapper.update(new LambdaUpdateWrapper<TradeDetailPriceDO>()
                             .set(TradeDetailPriceDO::getDeleted, 1)

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

@@ -220,7 +220,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
             if(tradeOrderBO.getTradeOrderBindDO()!=null) {
                 tradeOrderBO.getTradeOrderBindDO().setRemark(changedFields + shipTradeOrderCreateReqVO.getChangedFields1());
             }
-            tradeOrderRepositoryService.modifyOrder(tradeOrderBO,shipTradeOrderCreateReqVO.getOldtradeOrderDO().getId());
+            tradeOrderRepositoryService.modifyOrder(tradeOrderBO,shipTradeOrderCreateReqVO.getOldtradeOrderDO());
             //4 下单成功回调
             tradeSupplierCallbackService.afterAllOrderCreate(tradeOrderBO.getTradeOrderDO());
             //5.下单后处理

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

@@ -188,7 +188,7 @@
 
     <select id="getTradeOrderUserPage"
             resultType="com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderRespVO">
-        SELECT td.*,tou.contact_name,tou.credential_no,tou.mobile,count(tdl.id) num,sum(CASE WHEN tdl.voucher_status in (1,2,3,4,6,8,9) THEN	1 ELSE 0 END) realnum,(tr.origin_amount-tr.refund_amount) feeAmount,tdl.product_name,tdl.spec_type,ifnull(tr.origin_amount-tr.refund_amount,0) realAmount
+        SELECT td.*,su.nickname auditUser,toa.audit_time auditTime,tou.contact_name,tou.credential_no,tou.mobile,count(tdl.id) num,sum(CASE WHEN tdl.voucher_status in (1,2,3,4,6,8,9) THEN	1 ELSE 0 END) realnum,(tr.origin_amount-tr.refund_amount) feeAmount,tdl.product_name,tdl.spec_type,ifnull(tr.origin_amount-tr.refund_amount,0) realAmount
              ,tr.refund_amount refundAmount,
              ps.product_tag productTag,ps.product_tag2 productTag2,ps.product_tag3 productTag3,ps.product_tag4 productTag4
         FROM trade_order td
@@ -196,6 +196,8 @@
         left JOIN trade_detail tdl on td.id = tdl.order_id and tdl.deleted = 0
         left JOIN product_spu ps on ps.id = tdl.product_id
         LEFT JOIN ota_distributor od on od.id = td.source_id
+        LEFT JOIN trade_order_audit toa on toa.order_id = td.id and toa.audit_status = 1
+        left join system_users su on toa.audit_user = su.id
         LEFT JOIN (select m2.order_id,sum(m2.refund_amount) refund_amount,sum(m2.origin_amount) origin_amount from trade_refund m2  where m2.refund_status = 6 and m2.refund_method !=2 GROUP BY m2.order_id) tr on td.id = tr.order_id
         where td.deleted = 0 and tou.deleted = 0
         <if test="vo.orderStatus!=null and vo.orderStatus.size()>0">