优化

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

@@ -48,18 +48,7 @@ import com.yc.ship.module.otc.api.store.StoreApi;
 import com.yc.ship.module.otc.api.store.dto.StoreInfoRespDTO;
 import com.yc.ship.module.product.api.ProductApi;
 import com.yc.ship.module.product.api.VoyageApi;
-import com.yc.ship.module.product.api.dto.CategoryRespDTO;
-import com.yc.ship.module.product.api.dto.OrderRoomUseDTO;
-import com.yc.ship.module.product.api.dto.ProductBasicRuleRespDTO;
-import com.yc.ship.module.product.api.dto.ProductGroupRespDTO;
-import com.yc.ship.module.product.api.dto.ProductOtherRuleRespDTO;
-import com.yc.ship.module.product.api.dto.ProductRefundRuleRespDTO;
-import com.yc.ship.module.product.api.dto.ProductSaleRuleRespDTO;
-import com.yc.ship.module.product.api.dto.ProductSkuRespDTO;
-import com.yc.ship.module.product.api.dto.ProductSpuRespDTO;
-import com.yc.ship.module.product.api.dto.ProductTakeRuleRespDTO;
-import com.yc.ship.module.product.api.dto.ReduceStockReqDTO;
-import com.yc.ship.module.product.api.dto.VoyageRespDTO;
+import com.yc.ship.module.product.api.dto.*;
 import com.yc.ship.module.product.controller.admin.voyage.vo.VoyageRespVO;
 import com.yc.ship.module.product.dal.dataobject.priceroommodeltype.PriceRoomModelTypeDO;
 import com.yc.ship.module.product.dal.dataobject.voyage.VoyageDO;
@@ -84,82 +73,26 @@ import com.yc.ship.module.system.api.user.AdminUserApi;
 import com.yc.ship.module.system.api.user.dto.AdminUserRespDTO;
 import com.yc.ship.module.trade.api.dto.TradeOrderPayDTO;
 import com.yc.ship.module.trade.api.dto.TradeOrderRespDTO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.OrderPayAmountRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.OtcTradeOrderCreateRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.PayOrderReqVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.PayOrderRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.ShipTradeOrderCreateReqVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeDetailPageReqVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeDetailRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeHotelBookingRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderConfirmationCountryRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderConfirmationVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderDetailCountRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderLogRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderOtcCreateVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderPageReqVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderPdaRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderPolicyReqVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderRespNewVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderRoomModelVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderTotalVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeOrderVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeSpuReqVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeStaticReqVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.order.TradeVistorReqVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.order.*;
 import com.yc.ship.module.trade.controller.admin.order.vo.otc.PrintRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundDetailRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundPageReqVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundRecordPageReqVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundRecordRespVO;
-import com.yc.ship.module.trade.controller.admin.order.vo.refund.RefundRespVO;
+import com.yc.ship.module.trade.controller.admin.order.vo.refund.*;
 import com.yc.ship.module.trade.convert.order.TradeOrderConvert;
 import com.yc.ship.module.trade.dal.dataobject.audituser.AuditUserDO;
 import com.yc.ship.module.trade.dal.dataobject.contract.ContractDO;
 import com.yc.ship.module.trade.dal.dataobject.insurance.InsuranceDO;
 import com.yc.ship.module.trade.dal.dataobject.invoice.InvoiceDO;
-import com.yc.ship.module.trade.dal.dataobject.order.CategoryRespVO;
-import com.yc.ship.module.trade.dal.dataobject.order.TradeDetailBaseDO;
-import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderBindDO;
-import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderCountryDO;
-import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderDO;
-import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderDeliveryDO;
-import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderDeliveryVO;
-import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderHotelDO;
-import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderLogDO;
-import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderPayDO;
-import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderRoomModelDO;
-import com.yc.ship.module.trade.dal.dataobject.order.TradeOrderTotalDO;
-import com.yc.ship.module.trade.dal.dataobject.order.TradeVisitorDO;
+import com.yc.ship.module.trade.dal.dataobject.order.*;
 import com.yc.ship.module.trade.dal.dataobject.orderjz.OrderJzDO;
 import com.yc.ship.module.trade.dal.dataobject.orderpolicy.OrderPolicyDO;
 import com.yc.ship.module.trade.dal.dataobject.tradeOrderaudit.TradeOrderAuditDO;
 import com.yc.ship.module.trade.dal.mysql.audituser.AuditUserMapper;
 import com.yc.ship.module.trade.dal.mysql.contract.ContractMapper;
 import com.yc.ship.module.trade.dal.mysql.insurance.InsuranceMapper;
-import com.yc.ship.module.trade.dal.mysql.order.TradeDetailBaseMapper;
-import com.yc.ship.module.trade.dal.mysql.order.TradeDetailMapper;
-import com.yc.ship.module.trade.dal.mysql.order.TradeOrderCountryMapper;
-import com.yc.ship.module.trade.dal.mysql.order.TradeOrderDeliveryMapper;
-import com.yc.ship.module.trade.dal.mysql.order.TradeOrderFloorMapper;
-import com.yc.ship.module.trade.dal.mysql.order.TradeOrderLogMapper;
-import com.yc.ship.module.trade.dal.mysql.order.TradeOrderMapper;
-import com.yc.ship.module.trade.dal.mysql.order.TradeOrderRoomModelMapper;
-import com.yc.ship.module.trade.dal.mysql.order.TradeOrderTotalMapper;
-import com.yc.ship.module.trade.dal.mysql.order.TradeOrderUserMapper;
-import com.yc.ship.module.trade.dal.mysql.order.TradeVisitorMapper;
+import com.yc.ship.module.trade.dal.mysql.order.*;
 import com.yc.ship.module.trade.dal.mysql.orderjz.OrderJzMapper;
 import com.yc.ship.module.trade.dal.mysql.orderpolicy.OrderPolicyMapper;
 import com.yc.ship.module.trade.dal.mysql.tradeOrderaudit.TradeOrderAuditMapper;
-import com.yc.ship.module.trade.enums.ErrorCodeConstants;
-import com.yc.ship.module.trade.enums.PayAccountTypeEnum;
-import com.yc.ship.module.trade.enums.PayTypeEnum;
-import com.yc.ship.module.trade.enums.SellMethodEnum;
-import com.yc.ship.module.trade.enums.TradeOrderBindEnum;
-import com.yc.ship.module.trade.enums.TradeOrderOperateTypeEnum;
-import com.yc.ship.module.trade.enums.TradeOrderStatusEnum;
-import com.yc.ship.module.trade.enums.VoucherStatusEnum;
+import com.yc.ship.module.trade.enums.*;
 import com.yc.ship.module.trade.framework.annotation.TradeOrderLog;
 import com.yc.ship.module.trade.framework.common.ThreadLocalUtil;
 import com.yc.ship.module.trade.framework.common.TradeOrderLogUtils;
@@ -188,30 +121,15 @@ import java.io.InputStream;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.StringJoiner;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 import static com.yc.ship.framework.common.util.collection.CollectionUtils.convertList;
-import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUser;
-import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
-import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUserNickname;
+import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.*;
 import static com.yc.ship.module.trade.enums.ApiConstants.ORDER_CHANGE_TYPE_NEW;
-import static com.yc.ship.module.trade.enums.ErrorCodeConstants.ORDER_NOT_EXIST;
-import static com.yc.ship.module.trade.enums.ErrorCodeConstants.ORDER_OTC_FAIL;
-import static com.yc.ship.module.trade.enums.ErrorCodeConstants.ORDER_OTC_NONE;
+import static com.yc.ship.module.trade.enums.ErrorCodeConstants.*;
 
 
 /**
@@ -390,19 +308,19 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     @Override
     public CommonResult<?> queryOrderStatus(Long orderId) {
         TradeOrderDO tradeOrderDO = tradeOrderRepositoryService.getById(orderId);
-        if (tradeOrderDO != null && tradeOrderDO.getOrderStatus()==6) {
+        if (tradeOrderDO != null && tradeOrderDO.getOrderStatus() == 6) {
             return CommonResult.success(orderId);
         }
-        return CommonResult.error(999,"待轮询");
+        return CommonResult.error(999, "待轮询");
     }
 
     @Override
     public CommonResult<?> queryDeposiOrderStatus(Long orderId) {
         TradeOrderDO tradeOrderDO = tradeOrderRepositoryService.getById(orderId);
-        if (tradeOrderDO != null && tradeOrderDO.getDeposiStatus()==2) {
+        if (tradeOrderDO != null && tradeOrderDO.getDeposiStatus() == 2) {
             return CommonResult.success(orderId);
         }
-        return CommonResult.error(999,"待轮询");
+        return CommonResult.error(999, "待轮询");
     }
 
     @Override
@@ -411,7 +329,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         if (tradeOrderDO != null) {
             TradeOrderBindDO bindByOrder = tradeOrderRepositoryService.getBindByOrder(orderId);
             tradeOrderDO.setBindOrder(bindByOrder);
-            List<TradeOrderAuditDO> tradeOrderAuditList = tradeOrderAuditMapper.selectNewAuditorByOrderId(orderId,1);
+            List<TradeOrderAuditDO> tradeOrderAuditList = tradeOrderAuditMapper.selectNewAuditorByOrderId(orderId, 1);
             tradeOrderAuditList.forEach(item -> {
                 AdminUserRespDTO user = adminUserApi.getUser(item.getAuditUser());
                 item.setAuditUserName(user != null ? user.getUsername() : "未知");
@@ -428,7 +346,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         if (tradeOrderDO != null) {
             TradeOrderBindDO bindByOrder = tradeOrderRepositoryService.getBindByOrder(orderId);
             tradeOrderDO.setBindOrder(bindByOrder);
-            List<TradeOrderAuditDO> tradeOrderAuditList = tradeOrderAuditMapper.selectNewAuditorByOrderId(orderId,3);
+            List<TradeOrderAuditDO> tradeOrderAuditList = tradeOrderAuditMapper.selectNewAuditorByOrderId(orderId, 3);
             tradeOrderAuditList.forEach(item -> {
                 AdminUserRespDTO user = adminUserApi.getUser(item.getAuditUser());
                 item.setAuditUserName(user != null ? user.getUsername() : "未知");
@@ -624,7 +542,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             tradeOrderAuditDO.setAuditType(3);
             tradeOrderAuditDO.setTenantId(tradeOrderDO.getTenantId());
             tradeOrderAuditDO.setAuditCurrentStatus(tradeOrderDO.getAuditStatus());
-                tradeOrderAuditDO.setOrderNo(tradeOrderDO.getOrderNo());
+            tradeOrderAuditDO.setOrderNo(tradeOrderDO.getOrderNo());
             tradeOrderAuditDO.setOrderId(tradeOrderDO.getId());
             tradeOrderAuditMapper.insert(tradeOrderAuditDO);
             //审核 不通过还原到修改前订单
@@ -1593,7 +1511,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             shipTradeOrderCreateReqVO.setRealMoney(realAmount);
             shipTradeOrderCreateReqVO.setIsRead(0);
             shipTradeOrderCreateReqVO.setDeposi(createVO.getSummary().getDeposi());
-            shipTradeOrderCreateReqVO.setOrderSort(maxOrderNo+1);
+            shipTradeOrderCreateReqVO.setOrderSort(maxOrderNo + 1);
             shipTradeOrderCreateReqVO.setOtherMoney(otherMoney);
 
             ShipTradeOrderCreateReqVO.OrderUser orderUser = new ShipTradeOrderCreateReqVO.OrderUser();
@@ -1654,7 +1572,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                     TradeVistorReqVO tradeVistorReqVO = createVO.getTourist().stream().filter(v -> v.getId().equals(touristId)).findFirst().orElseGet(TradeVistorReqVO::new);
                     ShipTradeOrderCreateReqVO.Visitor visitor = getVisitor1(tradeVistorReqVO);
                     visitorList1.add(visitor);
-                    BigDecimal price = tradeSpuReqVO.getPrice()==null?BigDecimal.ZERO:tradeSpuReqVO.getPrice();
+                    BigDecimal price = tradeSpuReqVO.getPrice() == null ? BigDecimal.ZERO : tradeSpuReqVO.getPrice();
                     spuMoney = spuMoney.add(price);
                 }
                 orderDetail1.setVisitorList(visitorList1);
@@ -1710,8 +1628,8 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             orderPolicyMapper.deleteByOrderId(orderId);
             List<OrderPolicyDO> orderPolicyDOList = new ArrayList<>();
             List<TradeOrderPolicyReqVO> policyList = createVO.getPolicyList();
-            if(policyList != null) {
-                policyList.stream().forEach(policy -> {
+            if (policyList != null) {
+                policyList.forEach(policy -> {
                     OrderPolicyDO orderPolicyDO = new OrderPolicyDO();
                     orderPolicyDO.setOrderId(orderId);
                     orderPolicyDO.setOrderNo(orderNo);
@@ -1844,7 +1762,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 tradeOrderBindDO.setCustom("");
                 tradeOrderBindDO.setRemark("modify订单金额修改，订单金额：" + orderMoney + "，订单修改后实际金额：" + realAmount);
                 shipTradeOrderCreateReqVO.setTradeOrderBindDO(tradeOrderBindDO);
-            } else if ( createVO.getSummary().getDeposi() != null &&  !Objects.equals(shipTradeOrderCreateReqVO.getDeposi(), tradeOrderDO.getDeposi())) {
+            } else if (createVO.getSummary().getDeposi() != null && !Objects.equals(shipTradeOrderCreateReqVO.getDeposi(), tradeOrderDO.getDeposi())) {
                 shipTradeOrderCreateReqVO.setConfirmType(1);
                 TradeOrderBindDO tradeOrderBindDO = new TradeOrderBindDO();
                 tradeOrderBindDO.setId(IdWorker.getId());
@@ -1919,7 +1837,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                     TradeVistorReqVO tradeVistorReqVO = createVO.getTourist().stream().filter(v -> v.getId().equals(touristId)).findFirst().orElseGet(TradeVistorReqVO::new);
                     ShipTradeOrderCreateReqVO.Visitor visitor = getVisitor1(tradeVistorReqVO);
                     visitorList1.add(visitor);
-                    BigDecimal price = tradeSpuReqVO.getPrice()==null?BigDecimal.ZERO:tradeSpuReqVO.getPrice();
+                    BigDecimal price = tradeSpuReqVO.getPrice() == null ? BigDecimal.ZERO : tradeSpuReqVO.getPrice();
                     spuMoney = spuMoney.add(price);
                 }
                 orderDetail1.setVisitorList(visitorList1);
@@ -1948,7 +1866,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             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="";
+            String changedFields0 = "";
             AtomicReference<String> oldCardNo = new AtomicReference<>("");
             AtomicReference<String> newCardNo = new AtomicReference<>("");
             oldvisitorDOList.forEach(v -> {
@@ -1959,8 +1877,8 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             });
             for (TradeVistorReqVO tradeVistorReqVO : createVO.getTourist()) {
                 String cardNo = tradeVistorReqVO.getCardNo();
-                if(!StringUtils.isEmpty(cardNo)) {
-                    List<TradeVisitorDO> collect = oldvisitorDOList.stream().filter(v -> StringUtils.equals(cardNo,v.getCredentialNo())).collect(Collectors.toList());
+                if (!StringUtils.isEmpty(cardNo)) {
+                    List<TradeVisitorDO> collect = oldvisitorDOList.stream().filter(v -> StringUtils.equals(cardNo, v.getCredentialNo())).collect(Collectors.toList());
                     if (collect.isEmpty()) {
                         auditType = 3;
                         changedFields0 = "游客信息发生变更：" + oldCardNo.get() + "->" + newCardNo.get();
@@ -1973,7 +1891,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             String changedFields1 = com.yc.ship.module.trade.utils.BeanUtils.getChangedFields(oldTradeOrderTotal, tradeOrderTotalDO);
             System.err.println("changedFields1=" + changedFields1);
 
-            shipTradeOrderCreateReqVO.setChangedFields1(changedFields0+";"+changedFields1);
+            shipTradeOrderCreateReqVO.setChangedFields1(changedFields0 + ";" + changedFields1);
             CommonResult<TradeOrderRespDTO> result = doShipModifyOrder(loginUser, shipTradeOrderCreateReqVO);
             if (result.isError()) {
                 return CommonResult.error(result.getCode(), result.getMsg());
@@ -2007,16 +1925,16 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             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()) ) {
+            if (!Objects.equals(shipTradeOrderCreateReqVO.getRemark(), tradeOrderDO.getRemark()) || !Objects.equals(shipTradeOrderCreateReqVO.getLinkMobile(), tradeOrderDO.getLinkMobile()) || !Objects.equals(shipTradeOrderCreateReqVO.getLinkMan(), tradeOrderDO.getLinkMan())) {
                 auditType = 2;
             }
             if (!Objects.equals(shipTradeOrderCreateReqVO.getAmount(), tradeOrderDO.getAmount()) && loginUser.getDistributorId() == null) {
                 auditType = 3;
             }
-            if (!Objects.equals(shipTradeOrderCreateReqVO.getDeposi(), tradeOrderDO.getDeposi()) ) {
+            if (!Objects.equals(shipTradeOrderCreateReqVO.getDeposi(), tradeOrderDO.getDeposi())) {
                 auditType = 3;
             }
-            if (!Objects.equals(oldleaderAmount, leaderAmount)||!Objects.equals(oldwithAmount, withAmount)||!Objects.equals(oldotherMoney, otherMoney)) {
+            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) {
@@ -2027,7 +1945,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                 AuditUserDO auditUserDO = auditUserMapper.selectOne(new LambdaQueryWrapperX<AuditUserDO>().eq(AuditUserDO::getType, auditType).eq(AuditUserDO::getDeleted, 0).orderByDesc(AuditUserDO::getCreateTime).last("limit 1"));
                 tradeOrderMapper.update(new UpdateWrapper<TradeOrderDO>().set("audit_type", auditType).set("audit_user", auditUserDO == null ? "" : auditUserDO.getAuditUser()).set("order_status", TradeOrderStatusEnum.TRANSFER.getStatus()).set("audit_status", 1).eq("id", neworderId));
                 msg = "修改提交成功，等待管理员审核";
-            }else if(shipTradeOrderCreateReqVO.getDeposi().compareTo(BigDecimal.ZERO) > 0 && createVO.getIsYd() != 1 && Objects.equals(tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.YD.getStatus())){
+            } else if (shipTradeOrderCreateReqVO.getDeposi().compareTo(BigDecimal.ZERO) > 0 && createVO.getIsYd() != 1 && Objects.equals(tradeOrderDO.getOrderStatus(), TradeOrderStatusEnum.YD.getStatus())) {
                 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.TRANSFER.getStatus()).set("audit_status", 1).eq("id", neworderId));
                 msg = "修改提交成功，等待管理员审核";
@@ -2043,8 +1961,8 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             orderPolicyMapper.deleteByOrderId(orderId);
             List<OrderPolicyDO> orderPolicyDOList = new ArrayList<>();
             List<TradeOrderPolicyReqVO> policyList = createVO.getPolicyList();
-            if(policyList != null) {
-                policyList.stream().forEach(policy -> {
+            if (policyList != null) {
+                policyList.forEach(policy -> {
                     OrderPolicyDO orderPolicyDO = new OrderPolicyDO();
                     orderPolicyDO.setOrderId(orderId);
                     orderPolicyDO.setOrderNo(orderNo);
@@ -2067,7 +1985,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                     orderPolicyMapper.insertBatch(orderPolicyDOList);
                 }
             }
-            tradePublishUtils.publishOrderCreateSuccessMsg(neworderId+"");
+            tradePublishUtils.publishOrderCreateSuccessMsg(neworderId + "");
             OtcTradeOrderCreateRespVO respVO = TradeOrderConvert.INSTANCE.convert(result.getData());
             return CommonResult.success(respVO, msg);
         } finally {
@@ -2090,7 +2008,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         List<PriceRoomModelTypeDO> roomModelTypes = priceRoomModelTypeService.getByIds(roomModelTypeIds);
         Map<Long, PriceRoomModelTypeDO> roomModelTypeMap = CollectionUtils.convertMap(roomModelTypes, PriceRoomModelTypeDO::getId);
         roomModelList.forEach(item -> {
-            if(roomModelTypeMap!=null) {
+            if (roomModelTypeMap != null) {
                 PriceRoomModelTypeDO roomModelTypeDO = roomModelTypeMap.get(item.getRoomModelTypeId());
                 if (roomModelTypeDO != null) {
                     item.setRoomModelTypeName(roomModelTypeDO.getTypeName());
@@ -2121,7 +2039,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         TradeOrderTotalDO tradeOrderTotalDO = tradeOrderTotalMapper.selectOne(TradeOrderTotalDO::getOldOrderId, id);
         TradeOrderTotalVO summary = BeanUtils.toBean(tradeOrderTotalDO, TradeOrderTotalVO.class);
         // 会为null，导致前端报错
-        if(summary == null) {
+        if (summary == null) {
             summary = new TradeOrderTotalVO();
         }
         orderRespNewVO.setSummary(summary);
@@ -2475,15 +2393,15 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
     }
 
     @Override
-    public CommonResult<?> updateStatus(Long orderId, Integer  status) {
+    public CommonResult<?> updateStatus(Long orderId, Integer status) {
         TradeOrderDO tradeOrderDO = tradeOrderMapper.selectById(orderId);
         if (tradeOrderDO == null) {
             return CommonResult.error(ORDER_NOT_EXIST);
         }
         tradeOrderMapper.update(Wrappers.<TradeOrderDO>lambdaUpdate()
-          .set(TradeOrderDO::getOrderStatus, status)
-          .set(TradeOrderDO::getUpdateTime, LocalDateTime.now())
-          .eq(TradeOrderDO::getId, orderId)
+                .set(TradeOrderDO::getOrderStatus, status)
+                .set(TradeOrderDO::getUpdateTime, LocalDateTime.now())
+                .eq(TradeOrderDO::getId, orderId)
         );
         return CommonResult.success("修改成功");
     }