订单列表完善

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

@@ -55,6 +55,8 @@ import java.nio.file.Files;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
 
 import static com.yc.ship.framework.common.pojo.CommonResult.success;
 import static com.yc.ship.framework.operatelog.core.enums.OperateTypeEnum.*;
@@ -258,6 +260,11 @@ public class OtcTradeOrderController {
             } else {
                 item.setTotalPerson(0);
             }
+
+            Map<String, List<TradeOrderRoomModelVO>> roomDesc = item.getRoomModelList().stream().collect(Collectors.groupingBy(p -> p.getRoomModelName() + "(" + p.getFloor()+"F)"));
+            AtomicReference<String> roomDescStr = new AtomicReference<>("");
+            roomDesc.forEach((key, value) -> roomDescStr.set( roomDescStr.get()+" "+  value.size() +"*"+key ));
+            item.setRoomModelDetails(roomDescStr.get().trim());
         });
         return success(page);
     }

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

@@ -63,6 +63,9 @@ public class ShipTradeOrderCreateReqVO implements Serializable {
     @Schema(description = "是否审阅", example = "100")
     private Integer isRead;
 
+    @Schema(description = "订单序号", example = "100")
+    private Integer orderSort;
+
     @Schema(description = "订单联系人")
     private String linkMan;
 

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

@@ -429,4 +429,13 @@ public class TradeOrderPdaRespVO {
     @Schema(description = "是否审阅（0否 1是）")
     private Integer isRead;
 
+    @Schema(description = "审阅人")
+    private Long readUser;
+
+    @Schema(description = "审阅人名称")
+    private String readUserName;
+
+    @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

@@ -39,6 +39,9 @@ public class TradeOrderRespNewVO {
     @ExcelProperty("订单号")
     private String orderNo;
 
+    @Schema(description = "序号")
+    private Integer orderSort;
+
     @Schema(description = "团号")
     @ExcelProperty("团号")
     private String groupNo;
@@ -175,6 +178,9 @@ public class TradeOrderRespNewVO {
     @Schema(description = "房型信息")
     private List<TradeOrderRoomModelVO> roomModelList;
 
+    @Schema(description = "房型信息")
+    private String roomModelDetails;
+
     @Schema(description = "审核人")
     @ExcelProperty("审核人")
     private String auditUser;

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

@@ -515,5 +515,8 @@ public class TradeOrderRespVO {
     @Schema(description = "审阅人名称")
     private String readUserName;
 
+    @Schema(description = "订单序号")
+    private Integer orderSort;
+
 
 }

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

@@ -324,4 +324,9 @@ public class TradeOrderDO extends TenantBaseDO {
      * 审阅人员ID
      */
     private Long readUser;
+
+    /**
+     * 排序
+     */
+    private Integer orderSort;
 }

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

@@ -20,15 +20,10 @@ import java.util.List;
 public interface TradeOrderRoomModelMapper extends BaseMapperX<TradeOrderRoomModelDO> {
 
 
-    default List<TradeOrderRoomModelDO> selectListByOrderId(Long id) {
-        return selectList(new LambdaQueryWrapperX<TradeOrderRoomModelDO>()
-                .eq(TradeOrderRoomModelDO::getOrderId, id));
-    }
+    List<TradeOrderRoomModelDO> selectListByOrderId(@Param("orderId") Long id);
 
-    default List<TradeOrderRoomModelDO> selectListByOrderIds(List<Long> orderIds) {
-        return selectList(new LambdaQueryWrapperX<TradeOrderRoomModelDO>()
-                .in(TradeOrderRoomModelDO::getOrderId, orderIds));
-    }
+
+    List<TradeOrderRoomModelDO> selectListByOrderIds(@Param("orderIds") List<Long> orderIds);
 
     default void deleteByOrderId(Long orderId) {
         delete(new LambdaQueryWrapperX<TradeOrderRoomModelDO>()

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

@@ -479,6 +479,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         tradeOrderDO.setTravelDate(orderCreateReqDTO.getTravelDate());
         tradeOrderDO.setAmount(orderCreateReqDTO.getAmount());
         tradeOrderDO.setIsRead(orderCreateReqDTO.getIsRead());
+        tradeOrderDO.setOrderSort(orderCreateReqDTO.getOrderSort());
         tradeOrderDO.setPayAmount(orderCreateReqDTO.getPayAmount());
         tradeOrderDO.setRemark(orderCreateReqDTO.getRemark());
         tradeOrderDO.setItemId(orderCreateReqDTO.getItemId());

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

@@ -1377,6 +1377,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             }
             shipTradeOrderCreateReqVO.setRealMoney(realAmount);
             shipTradeOrderCreateReqVO.setIsRead(0);
+            shipTradeOrderCreateReqVO.setOrderSort(maxOrderNo+1);
             shipTradeOrderCreateReqVO.setOtherMoney(otherMoney);
 
             ShipTradeOrderCreateReqVO.OrderUser orderUser = new ShipTradeOrderCreateReqVO.OrderUser();
@@ -1569,6 +1570,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             shipTradeOrderCreateReqVO.setGroupNo(createVO.getGroupNo());
             shipTradeOrderCreateReqVO.setTravelDate(tradeOrderDO.getTravelDate());
             shipTradeOrderCreateReqVO.setOrderId(orderId);
+            shipTradeOrderCreateReqVO.setOrderSort(tradeOrderDO.getOrderSort());
             shipTradeOrderCreateReqVO.setIsRead(0);
             TradeOrderTotalVO summary = createVO.getSummary();
             BigDecimal realAmount = summary.getRealMoney();
@@ -1677,11 +1679,31 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             TradeOrderTotalDO oldTradeOrderTotal = tradeOrderTotalMapper.selectOne(new LambdaQueryWrapper<TradeOrderTotalDO>().eq(TradeOrderTotalDO::getOldOrderId, orderId));
             shipTradeOrderCreateReqVO.setOldtradeOrderTotalDO(oldTradeOrderTotal);
             TradeOrderTotalDO tradeOrderTotalDO = BeanUtils.toBean(summary, TradeOrderTotalDO.class);
+            List<TradeVisitorDO> oldvisitorDOList = tradeVisitorMapper.selectList(new LambdaQueryWrapper<TradeVisitorDO>().eq(TradeVisitorDO::getOrderId, tradeOrderDO.getId()));
+            String changedFields0="";
+            AtomicReference<String> oldCardNo = new AtomicReference<>("");
+            AtomicReference<String> newCardNo = new AtomicReference<>("");
+            oldvisitorDOList.forEach(v -> {
+                oldCardNo.set(oldCardNo.get() + v.getCredentialNo() + ";");
+            });
+            createVO.getTourist().forEach(v -> {
+                newCardNo.set(newCardNo.get() + v.getCardNo() + ";");
+            });
+            for (TradeVistorReqVO tradeVistorReqVO : createVO.getTourist()) {
+                String cardNo = tradeVistorReqVO.getCardNo();
+                List<TradeVisitorDO> collect = oldvisitorDOList.stream().filter(v -> v.getCredentialNo().equals(cardNo)).collect(Collectors.toList());
+                if(collect.isEmpty()) {
+                    changedFields0 = "游客信息发生变更："+oldCardNo.get()+"->"+newCardNo.get();
+                    break;
+                }
+            }
+
+
 
             String changedFields1 = com.yc.ship.module.trade.utils.BeanUtils.getChangedFields(oldTradeOrderTotal, tradeOrderTotalDO);
             System.err.println("changedFields1=" + changedFields1);
 
-            shipTradeOrderCreateReqVO.setChangedFields1(changedFields1);
+            shipTradeOrderCreateReqVO.setChangedFields1(changedFields0+";"+changedFields1);
             CommonResult<TradeOrderRespDTO> result = doShipModifyOrder(loginUser, shipTradeOrderCreateReqVO);
             if (result.isError()) {
                 return CommonResult.error(result.getCode(), result.getMsg());

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

@@ -1896,12 +1896,12 @@
     </select>
 
     <select id="getOrderCount" resultType="java.util.Map">
-        select GROUP_CONCAT(name,'-',num,'人') name,sum(num1) num1,sum(num2) num2,sum(num3) num3,sum(num4) num4 from (
+        select GROUP_CONCAT(num,'*',name) name,sum(num1) num1,sum(num2) num2,sum(num3) num3,sum(num4) num4 from (
         SELECT  sum(CASE WHEN tv.type='adultPlus' or tv.type='adultTake' THEN 1 ELSE 0 END) num1,
         sum(CASE WHEN tv.type='babyTake' or tv.type='babyPlus' or tv.type='babyNonTake' or tv.type='childTake' or tv.type='childPlus' or tv.type='childNonTake'  THEN 1 ELSE 0 END) num2,
         sum(CASE WHEN tv.type='with'  THEN 1 ELSE 0 END) num3,
         sum(CASE WHEN tv.type='leader'  THEN 1 ELSE 0 END) num4,
-        CONCAT(tv.floor,'楼-',rrm.short_name) name ,count(1) num
+        CONCAT(rrm.short_name,'(',tv.floor,'F)') name ,count(1) num
         FROM trade_order td
         INNER JOIN trade_order_user tou on td.id = tou.order_id
         left JOIN trade_detail tdl on td.id = tdl.order_id and tdl.deleted = 0