Merge branch 'main' of http://117.174.100.38:3000/lishiqiang/ship-ota-server into main1

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/api/VoyageApiImpl.java

@@ -3,6 +3,7 @@ package com.yc.ship.module.product.api;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.yc.ship.framework.common.util.collection.CollectionUtils;
+import com.yc.ship.framework.common.util.collection.MapUtils;
 import com.yc.ship.framework.common.util.object.BeanUtils;
 import com.yc.ship.module.product.api.dto.OrderRoomUseDTO;
 import com.yc.ship.module.product.api.dto.ReduceStockReqDTO;
@@ -597,8 +598,10 @@ public class VoyageApiImpl implements VoyageApi {
             roomUsedDO.setOrderId(orderId);
             roomUsedDO.setVoyageId(voyageId);
             OrderRoomUseDTO roomRespDTO = roomIdMap.get(item.getRoomId());
-            roomUsedDO.setRoomModelId(roomRespDTO.getRoomModelId());
-            roomUsedDO.setFloor(roomRespDTO.getFloor());
+            if(roomRespDTO!=null) {
+                roomUsedDO.setRoomModelId(roomRespDTO.getRoomModelId());
+                roomUsedDO.setFloor(roomRespDTO.getFloor());
+            }
             roomUsedDO.setRoomId(item.getRoomId());
             roomUsedDO.setNum(item.getNum());
             roomUsedDO.setStatus(orderStatus);
@@ -678,18 +681,9 @@ public class VoyageApiImpl implements VoyageApi {
 
         stockDetailList.forEach(item -> {
             String key = item.getRoomModelId() + "_" + item.getFloor();
-            BigDecimal totalNum = totalNumMap.get(key);
-            if(totalNum == null) {
-                totalNum = BigDecimal.ZERO;
-            }
-            BigDecimal realNum = realNumMap.get(key);
-            if (realNum == null) {
-                realNum = BigDecimal.ZERO;
-            }
-            BigDecimal virtualNum = virtualNumMap.get(key);
-            if (virtualNum == null) {
-                virtualNum = BigDecimal.ZERO;
-            }
+            BigDecimal totalNum = MapUtils.getBigDecimal(totalNumMap, key);
+            BigDecimal realNum = MapUtils.getBigDecimal(realNumMap, key);
+            BigDecimal virtualNum = MapUtils.getBigDecimal(virtualNumMap, key);
             item.setBookNum(item.getBookNum().subtract(totalNum));
             item.setCanSellNum(item.getCanSellNum().add(totalNum));
             item.setRealTotalNum(item.getRealTotalNum().add(realNum));
@@ -722,8 +716,9 @@ public class VoyageApiImpl implements VoyageApi {
                     if (item.getNum() == null) {
                         item.setNum(BigDecimal.ZERO);
                     }
-                    item.setNum(item.getNum().add(totalNumMap.get(key)));
-                    item.setBookNum(item.getBookNum().subtract(totalNumMap.get(key)));
+                    BigDecimal totalNum = MapUtils.getBigDecimal(totalNumMap, key);
+                    item.setNum(item.getNum().add(totalNum));
+                    item.setBookNum(item.getBookNum().subtract(totalNum));
                     if (item.getBookNum().compareTo(BigDecimal.ZERO) < 0) {
                         item.setBookNum(BigDecimal.ZERO);
                     }
@@ -757,7 +752,7 @@ public class VoyageApiImpl implements VoyageApi {
         //门店ID
         Long storeId = reqDTO.getStoreId();
         //总共使用房间数量
-        BigDecimal totalUseNum = reqDTO.getUseRoomNum();
+        BigDecimal totalUseNum = reqDTO.getUseRoomNum()==null?BigDecimal.ZERO:reqDTO.getUseRoomNum();
         Long orderId = reqDTO.getOrderId();
         Integer orderStatus = reqDTO.getOrderStatus();
 
@@ -1017,8 +1012,10 @@ public class VoyageApiImpl implements VoyageApi {
             roomUsedDO.setOrderId(orderId);
             roomUsedDO.setVoyageId(voyageId);
             OrderRoomUseDTO roomRespDTO = roomIdMap.get(item.getRoomId());
-            roomUsedDO.setRoomModelId(roomRespDTO.getRoomModelId());
-            roomUsedDO.setFloor(roomRespDTO.getFloor());
+            if(roomRespDTO!=null) {
+                roomUsedDO.setRoomModelId(roomRespDTO.getRoomModelId());
+                roomUsedDO.setFloor(roomRespDTO.getFloor());
+            }
             roomUsedDO.setRoomId(item.getRoomId());
             roomUsedDO.setNum(item.getNum());
             roomUsedDO.setStatus(orderStatus);

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

@@ -199,6 +199,14 @@ public class OtcTradeOrderController {
         return tradeOrderPayService.payOrderQuery(payOrderId);
     }
 
+    @GetMapping("/orderRead")
+    @Operation(summary = "订单审阅")
+    @OperateLog(type = TRADE)
+    @PlatTenantEnv
+    public CommonResult<?> orderRead(@RequestParam Long orderId) {
+        return otcTradeOrderService.orderRead(orderId);
+    }
+
     @PostMapping("/window/orderList")
     @OperateLog(type = API)
     @Operation(summary = "win-平台订单列表[分页]", description = "根据条件查询订单列表")

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

@@ -60,6 +60,9 @@ public class ShipTradeOrderCreateReqVO implements Serializable {
     @NotNull(message = "订单金额不能为空")
     private BigDecimal amount;
 
+    @Schema(description = "是否审阅", example = "100")
+    private Integer isRead;
+
     @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

@@ -426,4 +426,7 @@ public class TradeOrderPdaRespVO {
     @Schema(description = "酒店预定信息")
     private List<TradeHotelBookingRespVO> hotelBookingList;
 
+    @Schema(description = "是否审阅（0否 1是）")
+    private Integer isRead;
+
 }

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

@@ -184,4 +184,7 @@ public class TradeOrderRespNewVO {
     @JsonFormat(shape = JsonFormat.Shape.STRING,pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
     private LocalDateTime auditTime;
 
+    @Schema(description = "是否审阅（0否 1是）")
+    private Integer isRead;
+
 }

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

@@ -506,4 +506,8 @@ public class TradeOrderRespVO {
     private LocalDateTime auditTime;
 
 
+    @Schema(description = "是否审阅（0否 1是）")
+    private Integer isRead;
+
+
 }

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

@@ -314,4 +314,10 @@ public class TradeOrderDO extends TenantBaseDO {
 
     @TableField(exist = false)
     private List<TradeOrderAuditDO> tradeOrderAuditList;
+
+
+    /**
+     * 灰点（已审阅）/红点（未审阅） 0 未审阅 1 已审阅
+     */
+    private Integer isRead;
 }

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

@@ -145,6 +145,9 @@ public class TradeOrderServiceImpl implements TradeOrderService {
             }else{
                 tradeOrderRespVO.setIsShowAudit(0);
             }
+            if(tradeOrderRespVO.getIsRead()==null){
+                tradeOrderRespVO.setIsRead(0);
+            }
         });
         return new PageResult<>(iPage.getRecords(), iPage.getTotal());
     }
@@ -256,12 +259,12 @@ public class TradeOrderServiceImpl implements TradeOrderService {
             try {
                 ExceptionUtils.log(log, "订单修改失败:", e);
                 handleAfterOrderCreateFail(e.getCode(), tradeOrderBO);
-            }catch (Exception eee){
+            }catch (Exception ignored){
 
             }
             return CommonResult.error(e);
         } catch (Exception e) {
-            log.error("订单修改失败：", e);
+            log.error("订单修改失败：{}", String.valueOf(e));
             return CommonResult.error(ORDER_MODIFY_FAIL);
         }
     }
@@ -301,7 +304,6 @@ public class TradeOrderServiceImpl implements TradeOrderService {
     public CommonResult<?> modifyVisitor(TradeModifyVisitorReqDTO tradeModifyVisitorReqDTO) {
         //一票多人的数据 需要补
         //信任前端传入的数据，不做数量校验
-        List<TradeVisitorDO> insertList = new ArrayList<>();
         List<TradeVisitorDO> tradeVisitorDOList = new ArrayList<>();
         List<TradeModifyVisitorReqDTO.VisitorItem> visitorItemList = tradeModifyVisitorReqDTO.getVisitorList();
         for (TradeModifyVisitorReqDTO.VisitorItem visitorItem : visitorItemList) {
@@ -547,6 +549,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         tradeOrderDO.setExternalOrderNo(orderCreateReqDTO.getExternalOrderNo());
         tradeOrderDO.setTravelDate(orderCreateReqDTO.getTravelDate());
         tradeOrderDO.setAmount(orderCreateReqDTO.getAmount());
+        tradeOrderDO.setIsRead(orderCreateReqDTO.getIsRead());
         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/OtcTradeOrderService.java

@@ -125,4 +125,6 @@ public interface OtcTradeOrderService {
      * 生成确认单
      */
     File createConfirmaction(Long id, Double totalMoney);
+
+    CommonResult<?> orderRead(Long orderId);
 }

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

@@ -1367,6 +1367,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             shipTradeOrderCreateReqVO.setPayAmount(realOrderMoney);
         }
         shipTradeOrderCreateReqVO.setRealMoney(realAmount);
+        shipTradeOrderCreateReqVO.setIsRead(0);
         shipTradeOrderCreateReqVO.setOtherMoney(otherMoney);
 
         ShipTradeOrderCreateReqVO.OrderUser orderUser = new ShipTradeOrderCreateReqVO.OrderUser();
@@ -1549,6 +1550,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         shipTradeOrderCreateReqVO.setGroupNo(createVO.getGroupNo());
         shipTradeOrderCreateReqVO.setTravelDate(tradeOrderDO.getTravelDate());
         shipTradeOrderCreateReqVO.setOrderId(orderId);
+        shipTradeOrderCreateReqVO.setIsRead(0);
         TradeOrderTotalVO summary = createVO.getSummary();
         BigDecimal realAmount = summary.getRealMoney();
         BigDecimal orderMoney = summary.getOrderMoney();
@@ -2005,6 +2007,14 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         return new File(tmpFile);
     }
 
+    @Override
+    public CommonResult<?> orderRead(Long orderId) {
+        tradeOrderMapper.update(new LambdaUpdateWrapper<TradeOrderDO>()
+                .set(TradeOrderDO::getIsRead, 1)
+                .eq(TradeOrderDO::getId, orderId));
+        return CommonResult.success(orderId);
+    }
+
 
     private String getPersonTypeDes1(String type) {
         String des;

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

@@ -6,6 +6,7 @@
         <id property="id" column="id"/>
         <result property="orderNo" column="order_no"/>
         <result property="bindId" column="bindId"/>
+        <result property="isRead" column="isRead"/>
         <result property="sourceName" column="source_name"/>
         <result property="externalOrderNo" column="external_order_no"/>
         <result property="externalOriginOrderNo" column="external_origin_order_no"/>
@@ -56,6 +57,7 @@
         <id property="id" column="id"/>
         <result property="orderNo" column="order_no"/>
         <result property="bindId" column="bindId"/>
+        <result property="isRead" column="isRead"/>
         <result property="sourceName" column="source_name"/>
         <result property="externalOrderNo" column="external_order_no"/>
         <result property="externalOriginOrderNo" column="external_origin_order_no"/>
@@ -1177,7 +1179,7 @@
 
 
     <select id="getOrderInfo"  resultMap="MiddleWareDtoResultMap">
-        SELECT td.id,td.pay_amount,td.order_no,td.external_order_no,td.visitor_type,td.travel_date,td.sell_method,td.source_id,td.source_name,td.store_id,td.seller_id,td.member_id,td.amount,td.order_status,td.remark,td.share_name,td.create_time,td.is_marketing,td.is_marketing_use,
+        SELECT td.id,td.is_read isRead,td.pay_amount,td.order_no,td.external_order_no,td.visitor_type,td.travel_date,td.sell_method,td.source_id,td.source_name,td.store_id,td.seller_id,td.member_id,td.amount,td.order_status,td.remark,td.share_name,td.create_time,td.is_marketing,td.is_marketing_use,
         tou.contact_name contactName,tou.credential_no credentialNo,tou.mobile,tou.county,tou.province,tou.city,td.agency_group_id,
         top.id payId,top.pay_amount payAmount,top.pay_status,top.payment_type,top.payment_date,top.payment_no,
         td.store_name,td.is_invoice, td.confirm_type, td.travel_status, tr.refund_amount,td.finish_status,
@@ -1197,7 +1199,7 @@
     </select>
 
     <select id="getPdaOrderInfo"  resultMap="MiddleWareDtoResultMap2">
-        SELECT td.id,td.pay_amount,td.order_no,td.external_order_no,td.external_origin_order_no,td.route_plan_id,rt.name route_plan_name,td.visitor_type,td.travel_date,td.sell_method,td.source_id,td.source_name,td.store_id,td.seller_id,td.member_id,td.amount,td.order_status,td.remark,td.share_name,td.create_time,td.is_bind,td.area_manager_id,td.is_marketing,td.is_marketing_use,
+        SELECT td.id,td.is_read isRead,td.pay_amount,td.order_no,td.external_order_no,td.external_origin_order_no,td.route_plan_id,rt.name route_plan_name,td.visitor_type,td.travel_date,td.sell_method,td.source_id,td.source_name,td.store_id,td.seller_id,td.member_id,td.amount,td.order_status,td.remark,td.share_name,td.create_time,td.is_bind,td.area_manager_id,td.is_marketing,td.is_marketing_use,
         tou.contact_name contactName,tou.credential_no credentialNo,tou.mobile,tou.county,tou.province,tou.city,td.is_change_order,td.agency_group_id,
         top.id payId,top.pay_amount payAmount,top.pay_status,top.payment_type,top.payment_date,top.payment_no,
         td.store_name,td.dispatch_status,td.is_invoice, td.confirm_type, td.travel_status, tr.refund_amount,td.finish_status,