优化

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/audituser/vo/AuditUserSaveReqVO.java

@@ -18,6 +18,9 @@ public class AuditUserSaveReqVO {
     @Schema(description = "审核人")
     private Long auditUser;
 
+    @Schema(description = "当前审核类型")
+    private Integer auditStatus;
+
     @Schema(description = "审核备注信息", example = "随便")
     private String remark;
 

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

@@ -569,10 +569,10 @@ public class OtcTradeOrderController {
     @PlatTenantEnv
     public void exportOrderExcel(@Valid TradeOrderPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
         pageReqVO.setPageSize(10000);
-        if (pageReqVO.getVoyageId() == null) {
-            ExcelUtils.exportError(response, "游客列表.xls");
-            return;
-        }
+//        if (pageReqVO.getVoyageId() == null) {
+//            ExcelUtils.exportError(response, "游客列表.xls");
+//            return;
+//        }
         List<TradeOrderRespExcelVO> list = tradeOrderService.getExportVisitorList(pageReqVO);
         ExcelUtils.write(response, "游客列表.xls", "数据", TradeOrderRespExcelVO.class, list);
     }

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

@@ -82,7 +82,13 @@ public class TradeOrderTotalVO {
      * 领队费用
      */
     @Schema(description = "领队费用")
-    private BigDecimal leaderTotalMoney;
+    private BigDecimal leaderAmount;
+
+    /**
+     * 陪同费用
+     */
+    @Schema(description = "陪同费用")
+    private BigDecimal withAmount;
 
     /**
      * 包含服务费

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

@@ -84,6 +84,12 @@ public class TradeOrderTotalDO extends TenantBaseDO {
      */
     @ForUpdate(fieldName = "领队数")
     private Integer leaderTotalNum;
+
+    @ForUpdate(fieldName = "领队费")
+    private BigDecimal leaderAmount;
+
+    @ForUpdate(fieldName = "陪同费")
+    private BigDecimal withAmount;
     /**
      * 包含服务费
      */

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

@@ -344,8 +344,8 @@ public class AdminTradeOrderServiceImpl implements AdminTradeOrderService {
             tradeOrderBindDO.setCreator(getLoginUserId()+"");
             tradeOrderBindMapper.insert(tradeOrderBindDO);
 
-            AuditUserDO auditUserDO = auditUserMapper.selectOne(new LambdaQueryWrapperX<AuditUserDO>().eq(AuditUserDO::getType, 3).eq(AuditUserDO::getDeleted, 0).orderByDesc(AuditUserDO::getCreateTime).last("limit 1"));
-            tradeOrderMapper.update(new UpdateWrapper<TradeOrderDO>().set("audit_type", 3).set("audit_user", auditUserDO == null ? "" : auditUserDO.getAuditUser()).set("order_status", TradeOrderStatusEnum.CANCEL_AUDIT.getStatus()).set("audit_status", 1).eq("id", tradeOrderDO.getId()));
+            AuditUserDO auditUserDO = auditUserMapper.selectOne(new LambdaQueryWrapperX<AuditUserDO>().eq(AuditUserDO::getType, 4).eq(AuditUserDO::getDeleted, 0).orderByDesc(AuditUserDO::getCreateTime).last("limit 1"));
+            tradeOrderMapper.update(new UpdateWrapper<TradeOrderDO>().set("audit_type", 4).set("audit_user", auditUserDO == null ? "" : auditUserDO.getAuditUser()).set("order_status", TradeOrderStatusEnum.CANCEL_AUDIT.getStatus()).set("audit_status", 1).eq("id", tradeOrderDO.getId()));
             return CommonResult.success("订单取消审核中");
         }else{
             return tradeOrderPayService.cancelOrder(orderId);

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

@@ -1647,20 +1647,28 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                     orderPolicyDO.setRooms(policy.getRooms());
                     orderPolicyDOList.add(orderPolicyDO);
                 });
-                if (orderPolicyDOList.size() > 0) {
+                if (!orderPolicyDOList.isEmpty()) {
                     //TODO: 判断优惠政策是否需要审核
                     orderPolicyMapper.insertBatch(orderPolicyDOList);
                 }
             }
 
             int auditType = 0;
-            BigDecimal leaderTotalMoney = summary.getLeaderTotalMoney();
-            if (leaderTotalMoney != null && leaderTotalMoney.compareTo(new BigDecimal(0)) > 0) {
-                auditType = 3;
-            }
+            BigDecimal leaderAmount1 = summary.getLeaderAmount();
+            BigDecimal withAmount1 = summary.getWithAmount();
+            BigDecimal otherMoney1 = summary.getOtherMoney();
             if (deposi != null && deposi.compareTo(new BigDecimal(0)) > 0) {
                 auditType = 3;
             }
+            if (leaderAmount1 != null && leaderAmount1.compareTo(new BigDecimal(0)) > 0) {
+                auditType = 4;
+            }
+            if (withAmount1 != null && withAmount1.compareTo(new BigDecimal(0)) > 0) {
+                auditType = 4;
+            }
+            if (otherMoney1 != null && otherMoney1.compareTo(new BigDecimal(0)) > 0) {
+                auditType = 4;
+            }
             if (auditType > 0 && createVO.getIsYd() != 1) {
                 tradeOrderMapper.update(new UpdateWrapper<TradeOrderDO>().set("audit_type", auditType).set("order_status", TradeOrderStatusEnum.TRANSFER).set("audit_status", 1).eq("id", orderId));
             }
@@ -1910,6 +1918,13 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 tradeOrderRoomModelDO.setOrderNo(orderNo);
                 list.add(tradeOrderRoomModelDO);
             });
+            BigDecimal oldleaderAmount = oldTradeOrderTotal.getLeaderAmount();
+            BigDecimal oldwithAmount = oldTradeOrderTotal.getWithAmount();
+            BigDecimal oldotherMoney = oldTradeOrderTotal.getOtherMoney();
+
+            BigDecimal leaderAmount = summary.getLeaderAmount();
+            BigDecimal withAmount = summary.getWithAmount();
+            BigDecimal otherMoney = summary.getOtherMoney();
             if (!Objects.equals(shipTradeOrderCreateReqVO.getRemark(), tradeOrderDO.getRemark()) || !Objects.equals(shipTradeOrderCreateReqVO.getLinkMobile(), tradeOrderDO.getLinkMobile())  || !Objects.equals(shipTradeOrderCreateReqVO.getLinkMan(), tradeOrderDO.getLinkMan()) ) {
                 auditType = 2;
             }
@@ -1919,6 +1934,9 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             if (!Objects.equals(shipTradeOrderCreateReqVO.getDeposi(), tradeOrderDO.getDeposi()) ) {
                 auditType = 3;
             }
+            if (!Objects.equals(oldleaderAmount, leaderAmount)||!Objects.equals(oldwithAmount, withAmount)||!Objects.equals(oldotherMoney, otherMoney)) {
+                auditType = 3;
+            }
             if (!Objects.equals(shipTradeOrderCreateReqVO.getAmount(), tradeOrderDO.getAmount()) && loginUser.getDistributorId() != null) {
                 auditType = 4;
             }

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

@@ -219,8 +219,8 @@
         select t1.order_no orderNo,t1.group_no groupNo,t1.order_status orderStatus,t1.source_name sourceName,t3.name name,t3.gender gender,t3.credential_no credentialNo,t7.name nationality,t3.birthday birthday,t3.mobile mobile,t3.age age,t3.mobile mobile,t5.short_name roomModelName,t3.floor floor,t6.room_num roomName,t2.price price,t3.remark remark
         from trade_order t1 inner join trade_detail t2 on t1.id=t2.order_id and t2.product_type = 0 and t2.deleted = 0
         inner join trade_visitor t3 on t2.visitor_id=t3.id and t3.deleted =0
-        inner join trade_order_room_model t4 on t3.room_index_id=t4.room_index_id and t4.deleted=0
-        inner join resource_room_model t5 on t4.room_model_id = t5.id and t5.deleted=0
+        left join trade_order_room_model t4 on t3.room_index_id=t4.room_index_id and t4.deleted=0
+        left join resource_room_model t5 on t4.room_model_id = t5.id and t5.deleted=0
         left join resource_room t6 on t3.room_id = t6.id and t6.deleted=0
         left join area t7 on t3.nationality = t7.id
         where t1.order_status in (14, 13, 11, 10, 12, 9, 8, 7, 6, 5, 4, 3, 2, 1)