Merge remote-tracking branch 'ship-ota-server/main' into main1

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

@@ -113,7 +113,6 @@ import javax.annotation.Resource;
 import java.io.File;
 import java.io.InputStream;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.util.*;
@@ -320,20 +319,24 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             setShipOrderPropertyFromLoginUser(loginUser, orderProperty);
             otcTradeOrderCreateReqVO.setOrderProperty(orderProperty);
             return tradeOrderService.createShipOrder(otcTradeOrderCreateReqVO);
-        } catch (Exception e) {
-            throw e;
+        }catch (Exception e) {
+            return CommonResult.error(500, e.getMessage());
         }
     }
 
     private CommonResult<TradeOrderRespDTO> doShipModifyOrder(LoginUser loginUser, ShipTradeOrderCreateReqVO otcTradeOrderCreateReqVO) {
-        ShipTradeOrderCreateReqVO.OrderProperty orderProperty = otcTradeOrderCreateReqVO.getOrderProperty();
-        if (orderProperty == null) {
-            orderProperty = new ShipTradeOrderCreateReqVO.OrderProperty();
+        try {
+            ShipTradeOrderCreateReqVO.OrderProperty orderProperty = otcTradeOrderCreateReqVO.getOrderProperty();
+            if (orderProperty == null) {
+                orderProperty = new ShipTradeOrderCreateReqVO.OrderProperty();
+            }
+            orderProperty.setSellMethod(otcTradeOrderCreateReqVO.getOrderProperty().getSellMethod());
+            setShipOrderPropertyFromLoginUser(loginUser, orderProperty);
+            otcTradeOrderCreateReqVO.setOrderProperty(orderProperty);
+            return tradeOrderService.modifyShipOrder(otcTradeOrderCreateReqVO);
+        }catch (Exception e){
+            return CommonResult.error(500, e.getMessage());
         }
-        orderProperty.setSellMethod(otcTradeOrderCreateReqVO.getOrderProperty().getSellMethod());
-        setShipOrderPropertyFromLoginUser(loginUser, orderProperty);
-        otcTradeOrderCreateReqVO.setOrderProperty(orderProperty);
-        return tradeOrderService.modifyShipOrder(otcTradeOrderCreateReqVO);
     }
 
 
@@ -626,7 +629,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             tradeOrderAuditDO.setAuditTime(LocalDateTime.now());
             //审核状态 1、通过 2、不通过
             tradeOrderAuditDO.setAuditStatus(1);
-            tradeOrderAuditDO.setAuditCurrentStatus(tradeOrderDO.getAuditStatus() + 1);
+            tradeOrderAuditDO.setAuditCurrentStatus(tradeOrderDO.getAuditStatus() );
             tradeOrderAuditDO.setOrderNo(tradeOrderDO.getOrderNo());
             tradeOrderAuditMapper.insert(tradeOrderAuditDO);
 
@@ -1925,8 +1928,13 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         ShipTradeOrderCreateReqVO.OrderItem orderItem = new ShipTradeOrderCreateReqVO.OrderItem();
         List<ShipTradeOrderCreateReqVO.OrderDetail> detailList = new ArrayList<>();
         ShipTradeOrderCreateReqVO.OrderDetail orderDetail = new ShipTradeOrderCreateReqVO.OrderDetail();
-        List<ShipTradeOrderCreateReqVO.Visitor> visitorList = new ArrayList<>();
         for (TradeVistorReqVO tradeVistorReqVO : createVO.getTourist()) {
+            List<ShipTradeOrderCreateReqVO.Visitor> visitorList = new ArrayList<>();
+            ShipTradeOrderCreateReqVO.OrderDetail visitorDetailId = new ShipTradeOrderCreateReqVO.OrderDetail();
+            BeanUtils.copyProperties(orderDetail, ShipTradeOrderCreateReqVO.OrderDetail.class);
+            visitorDetailId.setPrice(tradeVistorReqVO.getActualPrice());
+            visitorDetailId.setOriginPrice(tradeVistorReqVO.getPrice());
+            visitorDetailId.setProductType(0);
             ShipTradeOrderCreateReqVO.Visitor visitor = getVisitor1(tradeVistorReqVO);
             visitor.setName(tradeVistorReqVO.getName());
             visitor.setVid(tradeVistorReqVO.getId());
@@ -1946,10 +1954,11 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             visitor.setRoomModelId(tradeVistorReqVO.getRoomModelId());
             visitor.setFloor(tradeVistorReqVO.getFloor());
             visitorList.add(visitor);
+            visitorDetailId.setVisitorList(visitorList);
+            visitorDetailId.setCount(1);
+            detailList.add(visitorDetailId);
         }
-        orderDetail.setVisitorList(visitorList);
-        orderDetail.setCount(visitorList.size());
-
+        orderItem.setDetailList(detailList);
         BigDecimal spuMoney = new BigDecimal(0);
         //[ {
         //  "productId" : 1995379153741963265,
@@ -1974,92 +1983,41 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             } else if (tradeSpuReqVO.getProductId() != null && tradeSpuReqVO.getRequired() != null && tradeSpuReqVO.getRequired() == 1) {
                 orderDetail1.setProductType(2);
             } else {
-                if (tradeSpuReqVO.getProductId() != null) {
-                    //有产品ID没有游客信息跳过
-                    continue;
-                }
-                orderDetail1.setProductType(0);
+                continue;
             }
             List<ShipTradeOrderCreateReqVO.Visitor> visitorList1 = new ArrayList<>();
-            if (orderDetail1.getProductType() == 0 || orderDetail1.getProductType() == 1) {
-                for (String touristId : tradeSpuReqVO.getTourist()) {
-                    TradeVistorReqVO tradeVistorReqVO = createVO.getTourist().stream().filter(v -> v.getId().equals(touristId)).findFirst().orElseGet(TradeVistorReqVO::new);
-                    ShipTradeOrderCreateReqVO.Visitor visitor = new ShipTradeOrderCreateReqVO.Visitor();
-                    visitor.setName(tradeVistorReqVO.getName());
-                    visitor.setVid(tradeVistorReqVO.getId());
-                    visitor.setMobile(tradeVistorReqVO.getMobile());
-                    visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
-                    visitor.setCredentialType(tradeVistorReqVO.getCardType());
-                    visitor.setBirthday(tradeVistorReqVO.getBirthday());
-                    visitor.setGender(tradeVistorReqVO.getGender());
-                    visitor.setYczz(tradeVistorReqVO.getYichang());
-                    visitor.setCqzz(tradeVistorReqVO.getChongqing());
-                    visitor.setNationality(tradeVistorReqVO.getNationality());
-                    visitor.setRoomId(tradeVistorReqVO.getRoomId());
-                    visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
-                    visitor.setType(tradeVistorReqVO.getType());
-                    visitor.setAge(tradeVistorReqVO.getAge());
-                    visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
-                    visitor.setRoomModelId(tradeVistorReqVO.getRoomModelId());
-                    visitor.setFloor(tradeVistorReqVO.getFloor());
-                    visitorList1.add(visitor);
-                    spuMoney = spuMoney.add(tradeSpuReqVO.getPrice());
-                }
-                orderDetail1.setVisitorList(visitorList1);
-                orderDetail1.setProductId(tradeSpuReqVO.getProductId() + "");
-                orderDetail1.setPrice(tradeSpuReqVO.getPrice());
-                orderDetail1.setOriginPrice(tradeSpuReqVO.getPrice());
-            } else {
-                for (TradeVistorReqVO tradeVistorReqVO : createVO.getTourist()) {
-                    ShipTradeOrderCreateReqVO.Visitor visitor = new ShipTradeOrderCreateReqVO.Visitor();
-                    visitor.setName(tradeVistorReqVO.getName());
-                    visitor.setVid(tradeVistorReqVO.getId());
-                    visitor.setMobile(tradeVistorReqVO.getMobile());
-                    visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
-                    visitor.setCredentialType(tradeVistorReqVO.getCardType());
-                    visitor.setYczz(tradeVistorReqVO.getYichang());
-                    visitor.setCqzz(tradeVistorReqVO.getChongqing());
-                    visitor.setRoomId(tradeVistorReqVO.getRoomId());
-                    visitor.setGender(tradeVistorReqVO.getGender());
-                    visitor.setBirthday(tradeVistorReqVO.getBirthday());
-                    visitor.setNationality(tradeVistorReqVO.getNationality());
-                    visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
-                    visitor.setType(tradeVistorReqVO.getType());
-                    visitor.setAge(tradeVistorReqVO.getAge());
-                    visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
-                    visitor.setRoomModelId(tradeVistorReqVO.getRoomModelId());
-                    visitor.setFloor(tradeVistorReqVO.getFloor());
-                    visitorList1.add(visitor);
-                }
-                orderDetail1.setVisitorList(visitorList1);
-                orderDetail1.setProductId(tradeSpuReqVO.getProductId() + "");
-                orderDetail1.setPrice(BigDecimal.ZERO);
-                orderDetail1.setOriginPrice(BigDecimal.ZERO);
+            for (String touristId : tradeSpuReqVO.getTourist()) {
+                TradeVistorReqVO tradeVistorReqVO = createVO.getTourist().stream().filter(v -> v.getId().equals(touristId)).findFirst().orElseGet(TradeVistorReqVO::new);
+                ShipTradeOrderCreateReqVO.Visitor visitor = new ShipTradeOrderCreateReqVO.Visitor();
+                visitor.setName(tradeVistorReqVO.getName());
+                visitor.setVid(tradeVistorReqVO.getId());
+                visitor.setMobile(tradeVistorReqVO.getMobile());
+                visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
+                visitor.setCredentialType(tradeVistorReqVO.getCardType());
+                visitor.setBirthday(tradeVistorReqVO.getBirthday());
+                visitor.setGender(tradeVistorReqVO.getGender());
+                visitor.setYczz(tradeVistorReqVO.getYichang());
+                visitor.setCqzz(tradeVistorReqVO.getChongqing());
+                visitor.setNationality(tradeVistorReqVO.getNationality());
+                visitor.setRoomId(tradeVistorReqVO.getRoomId());
+                visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
+                visitor.setType(tradeVistorReqVO.getType());
+                visitor.setAge(tradeVistorReqVO.getAge());
+                visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
+                visitor.setRoomModelId(tradeVistorReqVO.getRoomModelId());
+                visitor.setFloor(tradeVistorReqVO.getFloor());
+                visitorList1.add(visitor);
+                spuMoney = spuMoney.add(tradeSpuReqVO.getPrice());
             }
+            orderDetail1.setVisitorList(visitorList1);
+            orderDetail1.setProductId(tradeSpuReqVO.getProductId() + "");
+            orderDetail1.setPrice(tradeSpuReqVO.getPrice());
+            orderDetail1.setOriginPrice(tradeSpuReqVO.getPrice());
+
             orderDetail1.setCount(visitorList1.size());
             detailList.add(orderDetail1);
         }
 
-
-        BigDecimal price;
-        if (createVO.getSummary().getOrderMoney() != null && createVO.getSummary().getOrderMoney().compareTo(new BigDecimal(0)) > 0) {
-            if (createVO.getSummary().getOrderMoney().compareTo(spuMoney) < 0 || visitorList.isEmpty()) {
-                price = BigDecimal.ZERO;
-            } else {
-                price = createVO.getSummary().getOrderMoney().subtract(spuMoney).divide(new BigDecimal(visitorList.size()), 2, RoundingMode.HALF_UP);
-            }
-        } else {
-            price = new BigDecimal(0);
-        }
-        orderDetail.setPrice(price);
-        orderDetail.setOriginPrice(price);
-
-        orderDetail.setProductType(0);
-        detailList.add(orderDetail);
-
-
-        orderItem.setDetailList(detailList);
-
         shipTradeOrderCreateReqVO.setItemlList(Collections.singletonList(orderItem));
 
         shipTradeOrderCreateReqVO.setSpuAmount(spuMoney);
@@ -2214,8 +2172,13 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         ShipTradeOrderCreateReqVO.OrderItem orderItem = new ShipTradeOrderCreateReqVO.OrderItem();
         List<ShipTradeOrderCreateReqVO.OrderDetail> detailList = new ArrayList<>();
         ShipTradeOrderCreateReqVO.OrderDetail orderDetail = new ShipTradeOrderCreateReqVO.OrderDetail();
-        List<ShipTradeOrderCreateReqVO.Visitor> visitorList = new ArrayList<>();
         for (TradeVistorReqVO tradeVistorReqVO : createVO.getTourist()) {
+            List<ShipTradeOrderCreateReqVO.Visitor> visitorList = new ArrayList<>();
+            ShipTradeOrderCreateReqVO.OrderDetail visitorDetailId = new ShipTradeOrderCreateReqVO.OrderDetail();
+            BeanUtils.copyProperties(orderDetail, ShipTradeOrderCreateReqVO.OrderDetail.class);
+            visitorDetailId.setPrice(tradeVistorReqVO.getPrice());
+            visitorDetailId.setOriginPrice(tradeVistorReqVO.getPrice());
+            visitorDetailId.setProductType(0);
             ShipTradeOrderCreateReqVO.Visitor visitor = new ShipTradeOrderCreateReqVO.Visitor();
             visitor.setName(tradeVistorReqVO.getName());
             visitor.setVid(tradeVistorReqVO.getId());
@@ -2235,9 +2198,13 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             visitor.setRoomModelId(tradeVistorReqVO.getRoomModelId());
             visitor.setFloor(tradeVistorReqVO.getFloor());
             visitorList.add(visitor);
+            visitorDetailId.setVisitorList(visitorList);
+            visitorDetailId.setCount(1);
+            visitorDetailId.setPrice(tradeVistorReqVO.getActualPrice());
+            visitorDetailId.setOriginPrice(tradeVistorReqVO.getPrice());
+            visitorDetailId.setProductType(0);
+            detailList.add(visitorDetailId);
         }
-        orderDetail.setVisitorList(visitorList);
-        orderDetail.setCount(visitorList.size());
         BigDecimal spuMoney = new BigDecimal(0);
         for (TradeSpuReqVO tradeSpuReqVO : createVO.getSpuList()) {
             ShipTradeOrderCreateReqVO.OrderDetail orderDetail1 = new ShipTradeOrderCreateReqVO.OrderDetail();
@@ -2247,85 +2214,41 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             } else if (tradeSpuReqVO.getProductId() != null && tradeSpuReqVO.getRequired() != null && tradeSpuReqVO.getRequired() == 1) {
                 orderDetail1.setProductType(2);
             } else {
-                if (tradeSpuReqVO.getProductId() != null) {
-                    //有产品ID没有游客信息跳过
-                    continue;
-                }
-                orderDetail1.setProductType(0);
+                continue;
             }
             List<ShipTradeOrderCreateReqVO.Visitor> visitorList1 = new ArrayList<>();
-            if (orderDetail1.getProductType() == 0 || orderDetail1.getProductType() == 1) {
-                for (String touristId : tradeSpuReqVO.getTourist()) {
-                    TradeVistorReqVO tradeVistorReqVO = createVO.getTourist().stream().filter(v -> v.getId().equals(touristId)).findFirst().orElseGet(TradeVistorReqVO::new);
-                    ShipTradeOrderCreateReqVO.Visitor visitor = new ShipTradeOrderCreateReqVO.Visitor();
-                    visitor.setName(tradeVistorReqVO.getName());
-                    visitor.setVid(tradeVistorReqVO.getId());
-                    visitor.setMobile(tradeVistorReqVO.getMobile());
-                    visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
-                    visitor.setCredentialType(tradeVistorReqVO.getCardType());
-                    visitor.setBirthday(tradeVistorReqVO.getBirthday());
-                    visitor.setGender(tradeVistorReqVO.getGender());
-                    visitor.setYczz(tradeVistorReqVO.getYichang());
-                    visitor.setCqzz(tradeVistorReqVO.getChongqing());
-                    visitor.setNationality(tradeVistorReqVO.getNationality());
-                    visitor.setRoomId(tradeVistorReqVO.getRoomId());
-                    visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
-                    visitor.setType(tradeVistorReqVO.getType());
-                    visitor.setAge(tradeVistorReqVO.getAge());
-                    visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
-                    visitor.setRoomModelId(tradeVistorReqVO.getRoomModelId());
-                    visitor.setFloor(tradeVistorReqVO.getFloor());
-                    visitorList1.add(visitor);
-                    spuMoney = spuMoney.add(tradeSpuReqVO.getPrice());
-                }
-                orderDetail1.setVisitorList(visitorList1);
-                orderDetail1.setProductId(tradeSpuReqVO.getProductId() + "");
-                orderDetail1.setPrice(tradeSpuReqVO.getPrice());
-                orderDetail1.setOriginPrice(tradeSpuReqVO.getPrice());
-            } else {
-                for (TradeVistorReqVO tradeVistorReqVO : createVO.getTourist()) {
-                    ShipTradeOrderCreateReqVO.Visitor visitor = new ShipTradeOrderCreateReqVO.Visitor();
-                    visitor.setName(tradeVistorReqVO.getName());
-                    visitor.setVid(tradeVistorReqVO.getId());
-                    visitor.setMobile(tradeVistorReqVO.getMobile());
-                    visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
-                    visitor.setCredentialType(tradeVistorReqVO.getCardType());
-                    visitor.setYczz(tradeVistorReqVO.getYichang());
-                    visitor.setCqzz(tradeVistorReqVO.getChongqing());
-                    visitor.setRoomId(tradeVistorReqVO.getRoomId());
-                    visitor.setGender(tradeVistorReqVO.getGender());
-                    visitor.setBirthday(tradeVistorReqVO.getBirthday());
-                    visitor.setNationality(tradeVistorReqVO.getNationality());
-                    visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
-                    visitor.setType(tradeVistorReqVO.getType());
-                    visitor.setAge(tradeVistorReqVO.getAge());
-                    visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
-                    visitor.setRoomModelId(tradeVistorReqVO.getRoomModelId());
-                    visitor.setFloor(tradeVistorReqVO.getFloor());
-                    visitorList1.add(visitor);
-                }
-                orderDetail1.setVisitorList(visitorList1);
-                orderDetail1.setProductId(tradeSpuReqVO.getProductId() + "");
-                orderDetail1.setPrice(BigDecimal.ZERO);
-                orderDetail1.setOriginPrice(BigDecimal.ZERO);
+            for (String touristId : tradeSpuReqVO.getTourist()) {
+                TradeVistorReqVO tradeVistorReqVO = createVO.getTourist().stream().filter(v -> v.getId().equals(touristId)).findFirst().orElseGet(TradeVistorReqVO::new);
+                ShipTradeOrderCreateReqVO.Visitor visitor = new ShipTradeOrderCreateReqVO.Visitor();
+                visitor.setName(tradeVistorReqVO.getName());
+                visitor.setVid(tradeVistorReqVO.getId());
+                visitor.setMobile(tradeVistorReqVO.getMobile());
+                visitor.setCredentialNo(tradeVistorReqVO.getCardNo());
+                visitor.setCredentialType(tradeVistorReqVO.getCardType());
+                visitor.setBirthday(tradeVistorReqVO.getBirthday());
+                visitor.setGender(tradeVistorReqVO.getGender());
+                visitor.setYczz(tradeVistorReqVO.getYichang());
+                visitor.setCqzz(tradeVistorReqVO.getChongqing());
+                visitor.setNationality(tradeVistorReqVO.getNationality());
+                visitor.setRoomId(tradeVistorReqVO.getRoomId());
+                visitor.setCohabitation(tradeVistorReqVO.getCohabitation());
+                visitor.setType(tradeVistorReqVO.getType());
+                visitor.setAge(tradeVistorReqVO.getAge());
+                visitor.setRoomIndexId(tradeVistorReqVO.getRoomIndexId());
+                visitor.setRoomModelId(tradeVistorReqVO.getRoomModelId());
+                visitor.setFloor(tradeVistorReqVO.getFloor());
+                visitorList1.add(visitor);
+                spuMoney = spuMoney.add(tradeSpuReqVO.getPrice());
             }
+            orderDetail1.setVisitorList(visitorList1);
+            orderDetail1.setProductId(tradeSpuReqVO.getProductId() + "");
+            orderDetail1.setPrice(tradeSpuReqVO.getPrice());
+            orderDetail1.setOriginPrice(tradeSpuReqVO.getPrice());
             orderDetail1.setCount(visitorList1.size());
             detailList.add(orderDetail1);
         }
-        BigDecimal price;
-        if (createVO.getSummary().getOrderMoney() != null && createVO.getSummary().getOrderMoney().compareTo(new BigDecimal(0)) > 0) {
-            if (createVO.getSummary().getOrderMoney().compareTo(spuMoney) < 0 || visitorList.isEmpty()) {
-                price = BigDecimal.ZERO;
-            } else {
-                price = createVO.getSummary().getOrderMoney().subtract(spuMoney).divide(new BigDecimal(visitorList.size()), 2, RoundingMode.HALF_UP);
-            }
-        } else {
-            price = BigDecimal.ZERO;
-        }
-        orderDetail.setPrice(price);
-        orderDetail.setOriginPrice(price);
-        orderDetail.setProductType(0);
-        detailList.add(orderDetail);
+
+
         orderItem.setDetailList(detailList);
         shipTradeOrderCreateReqVO.setItemlList(Collections.singletonList(orderItem));
         shipTradeOrderCreateReqVO.setSpuAmount(spuMoney);
@@ -2349,7 +2272,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         shipTradeOrderCreateReqVO.setChangedFields1(changedFields1);
         CommonResult<TradeOrderRespDTO> result = doShipModifyOrder(loginUser, shipTradeOrderCreateReqVO);
         if (result.isError()) {
-//            throw new ServiceException(result.getCode(), result.getMsg());
             return CommonResult.error(result.getCode(), result.getMsg());
         }
         Long neworderId = result.getCheckedData().getOrderId();
@@ -2381,7 +2303,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         if (!Objects.equals(shipTradeOrderCreateReqVO.getAmount(), tradeOrderDO.getAmount()) && loginUser.getDistributorId() == null) {
             auditType = 3;
         }
-        String msg="";
+        String msg = "";
         if (auditType > 0 && createVO.getIsYd() != 1) {
             tradeOrderMapper.update(new UpdateWrapper<TradeOrderDO>().set("audit_type", auditType).set("order_status", TradeOrderStatusEnum.TRANSFER.getStatus()).set("audit_status", 1).eq("id", neworderId));
             msg = "修改提交成功，等待管理员审核";
@@ -2393,7 +2315,7 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         }
 
         OtcTradeOrderCreateRespVO respVO = TradeOrderConvert.INSTANCE.convert(result.getData());
-        return CommonResult.success(respVO,msg);
+        return CommonResult.success(respVO, msg);
 
     }