Merge branch 'main' of http://47.98.207.247:3000/lsq/ship-ota-server into main

ship-module-marketing/ship-module-marketing-api/src/main/java/com/yc/ship/module/marketing/enums/common/AuditStateEnum.java

@@ -21,6 +21,7 @@ public enum AuditStateEnum implements IntArrayValuable {
     public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(AuditStateEnum::getType).toArray();
     private final Integer type;
     private final String name;
+    @Override
     public int[] array() {
         return ARRAYS;
     }

ship-module-marketing/ship-module-marketing-api/src/main/java/com/yc/ship/module/marketing/enums/common/EnableStateEnum.java

@@ -17,7 +17,8 @@ public enum EnableStateEnum implements IntArrayValuable {
     private final int type;
     private final String name;
 
+    @Override
     public int[] array() {
-       return ARRAYS;
+        return ARRAYS;
     }
 }

ship-module-marketing/ship-module-marketing-api/src/main/java/com/yc/ship/module/marketing/enums/coupon/CouponCodeUseStateEnum.java

@@ -19,6 +19,7 @@ public enum CouponCodeUseStateEnum implements IntArrayValuable {
     private final int type;
     private final String name;
 
+    @Override
     public int[] array() {
         return ARRAYS;
     }

ship-module-marketing/ship-module-marketing-api/src/main/java/com/yc/ship/module/marketing/enums/coupon/CouponDeliverUserGroupType.java

@@ -19,6 +19,7 @@ public enum CouponDeliverUserGroupType implements IntArrayValuable {
     private final int type;
     private final String name;
 
+    @Override
     public int[] array() {
         return ARRAYS;
     }

ship-module-marketing/ship-module-marketing-api/src/main/java/com/yc/ship/module/marketing/enums/coupon/CouponProductTypeEnum.java

@@ -19,6 +19,7 @@ public enum CouponProductTypeEnum implements IntArrayValuable {
     private final Integer type;
     private final String name;
 
+    @Override
     public int[] array() {
         return ARRAYS;
     }

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/api/coupon/CouponApiImpl.java

@@ -58,7 +58,7 @@ public class CouponApiImpl  implements CouponApi{
         if(couponDO == null) {
             throw exception(COUPON_NOT_EXISTS);
         }
-        if(couponDO.getAuditState() != CouponAuditStateEnum.AUDIT_PASS.getType()) {
+        if(!couponDO.getAuditState().equals(CouponAuditStateEnum.AUDIT_PASS.getType())) {
             throw exception(COUPON_NOT_AUDIT_PASS);
         }
         if(couponDO.getState() != EnableStateEnum.ENABLE.getType()) {
@@ -113,7 +113,7 @@ public class CouponApiImpl  implements CouponApi{
         //3.判断是否使用后继续发券
         CouponDO coupon = couponService.getCoupon(couponId);
         Integer useAfter = coupon.getUseAfter();
-        if(useAfter == YesOrNoEnum.YES.getType()) {
+        if(useAfter.equals(YesOrNoEnum.YES.getType())) {
             couponService.receiveCoupon(reqDto.getMemberId(), couponId);
         }
         return CommonResult.success(true);
@@ -173,10 +173,10 @@ public class CouponApiImpl  implements CouponApi{
             CouponCodeDO couponCodeDO = couponCodeMapper.selectById(couponCodeUseRecordDO.getCouponCodeId());
             Long couponId = couponCodeDO.getCouponId();
             CouponDO coupon = couponService.getCoupon(couponId);
-            if(coupon.getUseAfter() == YesOrNoEnum.NO.getType()) {
+            if(coupon.getUseAfter().equals(YesOrNoEnum.NO.getType())) {
                 //如果是不继续发券，则直接修改为未使用
                 couponCodeMapper.updateById(couponCodeDO.setState(CouponCodeUseStateEnum.UNUSED.getType()));
-            }else if(coupon.getUseAfter() == YesOrNoEnum.YES.getType()) {
+            }else if(coupon.getUseAfter().equals(YesOrNoEnum.YES.getType())) {
                 //是继续发券，则直接删除券码
                 couponCodeMapper.deleteById(couponCodeDO.getId());
             }

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/service/coupon/CouponServiceImpl.java

@@ -192,10 +192,10 @@ public class CouponServiceImpl implements CouponService {
 
         }
 
-        if (CouponAuditStateEnum.AUDIT_PASS.getType() != couponDO.getAuditState()) {
+        if (!CouponAuditStateEnum.AUDIT_PASS.getType().equals(couponDO.getAuditState())) {
             throw exception(COUPON_NOT_AUDIT_PASS);
         }
-        if(CommonStatusEnum.ENABLE.getStatus() != couponDO.getState()) {
+        if(!CommonStatusEnum.ENABLE.getStatus().equals(couponDO.getState())) {
             throw exception(COUPON_NOT_ENABLE);
         }
         //2.检查派发规则
@@ -272,14 +272,14 @@ public class CouponServiceImpl implements CouponService {
             Boolean flag = basic.compareTo(reqVo.getOrderAmount()) <= 0;
             //满足门槛金额
             if (flag) {
-                if (couponDO.getRelationType() == CouponProductTypeEnum.ALL.getType()) {
+                if (couponDO.getRelationType().equals(CouponProductTypeEnum.ALL.getType())) {
                     return true;
-                } else if (couponDO.getRelationType() == CouponProductTypeEnum.CATEGORY.getType()) {
+                } else if (couponDO.getRelationType().equals(CouponProductTypeEnum.CATEGORY.getType())) {
                     if(finalType == null) {
                         return false;
                     }
                     return finalType.equals(couponDO.getRelationId());
-                } else if (couponDO.getRelationType() == CouponProductTypeEnum.CUSTOM.getType()) {
+                } else if (couponDO.getRelationType().equals(CouponProductTypeEnum.CUSTOM.getType())) {
                     boolean flag1 = couponDO.getRelationChildId().equals(reqVo.getSpuId());
                     if (flag1) {
                         List<String> list1 = Arrays.asList(couponDO.getRelationSkuId().split(","));
@@ -342,15 +342,15 @@ public class CouponServiceImpl implements CouponService {
             List<CouponProductDo> couponProductDoList = longListMap.get(couponDO.getId());
             List<CouponProductDo> filterList = couponProductDoList.stream().filter(couponProductDo -> {
                 Integer relationType = couponProductDo.getType();
-                if (relationType == CouponProductTypeEnum.ALL.getType()) {
+                if (relationType.equals(CouponProductTypeEnum.ALL.getType())) {
                     return true;
-                } else if (relationType == CouponProductTypeEnum.CATEGORY.getType()) {
+                } else if (relationType.equals(CouponProductTypeEnum.CATEGORY.getType())) {
                     if(finalType == null) {
                         return false;
                     }
-                    return finalType.equals(couponProductDo.getRelationId()) || finalType == couponProductDo.getRelationId();
-                } else if (relationType == CouponProductTypeEnum.CUSTOM.getType()) {
-                    return couponProductDo.getRelationChildId().equals(spuId) || couponProductDo.getRelationChildId() == spuId;
+                    return finalType.equals(couponProductDo.getRelationId()) || finalType.equals(couponProductDo.getRelationId());
+                } else if (relationType.equals(CouponProductTypeEnum.CUSTOM.getType())) {
+                    return couponProductDo.getRelationChildId().equals(spuId) || couponProductDo.getRelationChildId().equals(spuId);
                 }
                 return false;
             }).collect(Collectors.toList());

ship-module-marketing/ship-module-marketing-biz/src/main/java/com/yc/ship/module/marketing/service/couponProduct/CouponProductServiceImpl.java

@@ -53,10 +53,10 @@ public class CouponProductServiceImpl implements CouponProductService {
         //删除之前的记录
         couponProductMapper.deleteByCouponId(couponId);
         //再新增现在的
-        if(CouponProductTypeEnum.ALL.getType() == type) {
+        if(CouponProductTypeEnum.ALL.getType().equals(type)) {
             CouponProductDo couponProductDo = BeanUtils.toBean(reqVO, CouponProductDo.class);
             couponProductMapper.insert(couponProductDo);
-        }else if(CouponProductTypeEnum.CATEGORY.getType() == type){
+        }else if(CouponProductTypeEnum.CATEGORY.getType().equals(type)){
             List<Long> relationIds = reqVO.getRelationIds();
             List<CouponProductDo> list = new ArrayList<>();
             relationIds.stream().forEach(relationId -> {
@@ -67,7 +67,7 @@ public class CouponProductServiceImpl implements CouponProductService {
                 list.add(couponProductDo);
             });
             couponProductMapper.insertBatch(list);
-        }else if(CouponProductTypeEnum.CUSTOM.getType() == type){
+        }else if(CouponProductTypeEnum.CUSTOM.getType().equals(type)){
             List<RelationReqVo> relationList = reqVO.getRelationList();
             List<CouponProductDo> list = new ArrayList<>();
             relationList.stream().forEach(relation -> {
@@ -93,10 +93,10 @@ public class CouponProductServiceImpl implements CouponProductService {
             CouponProductDo couponProductDo = list.get(0);
             vo.setCouponId(couponProductDo.getCouponId());
             vo.setType(couponProductDo.getType());
-            if(CouponProductTypeEnum.CATEGORY.getType() == couponProductDo.getType()) {
+            if(CouponProductTypeEnum.CATEGORY.getType().equals(couponProductDo.getType())) {
                 List<Long> relationIds = CollectionUtils.convertList(list, CouponProductDo::getRelationId);
                 vo.setRelationIds(relationIds);
-            }else if(CouponProductTypeEnum.CUSTOM.getType() == couponProductDo.getType()) {
+            }else if(CouponProductTypeEnum.CUSTOM.getType().equals(couponProductDo.getType())) {
                 List<RelationRespVo> relationList = couponProductMapper.selectRelationProductList(couponId);
                 relationList.stream().forEach(item -> item.setRelationSkuIds(Arrays.asList(item.getRelationSkuIdsStr().split(","))));
                 vo.setRelationList(relationList);

ship-module-ota/ship-module-ota-api/src/main/java/com/yc/ship/module/ota/enums/AuditStatusEnum.java

@@ -17,6 +17,7 @@ public enum AuditStatusEnum implements IntArrayValuable {
     private final Integer value;
     public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(AuditStatusEnum::getValue).toArray();
 
+    @Override
     public int[] array() {
         return ARRAYS;
     }

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributorselfrecharge/DistributorSelfRechargeServiceImpl.java

@@ -21,7 +21,6 @@ import javax.annotation.Resource;
 import java.util.concurrent.atomic.AtomicReference;
 
 import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception0;
-import static com.yc.ship.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
 
 /**
@@ -46,8 +45,8 @@ public class DistributorSelfRechargeServiceImpl implements DistributorSelfRechar
 
 
 
+    @Override
     public DistributorSelfRechargeSimpleRespVO createDistributorSelfRecharge(DistributorSelfRechargeSaveReqVO createReqVO) {
-        long loginUserId = getLoginUserId();
         LoginTypeRespVO loginType = distributorService.getLoginType();
 
         if (loginType.getType() == 3) {
@@ -57,7 +56,6 @@ public class DistributorSelfRechargeServiceImpl implements DistributorSelfRechar
         // 插入
         DistributorSelfRechargeDO distributorSelfRecharge = BeanUtils.toBean(createReqVO, DistributorSelfRechargeDO.class);
         Long id = IdWorker.getId(distributorSelfRecharge);
-        String rechargeNo = "CZ" + id;
         distributorSelfRecharge.setId(id);
         distributorSelfRecharge.setDistributorId(loginType.getDistributorId());
         distributorSelfRecharge.setRechargeState(0);

ship-module-product/ship-module-product-api/src/main/java/com/yc/ship/module/product/enums/DistributorOrStoreEnum.java

@@ -17,6 +17,7 @@ public enum DistributorOrStoreEnum implements IntArrayValuable {
     private final Integer value;
     public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(DistributorOrStoreEnum::getValue).toArray();
 
+    @Override
     public int[] array() {
         return ARRAYS;
     }

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

@@ -36,6 +36,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 
 import static com.yc.ship.framework.common.exception.util.ServiceExceptionUtil.exception;
@@ -43,7 +44,7 @@ import static com.yc.ship.module.product.enums.ErrorCodeConstants.*;
 
 @Service
 @Slf4j
-public class VoyageApiImpl implements VoyageApi{
+public class VoyageApiImpl implements VoyageApi {
 
     @Resource
     private VoyageStockDistributeNewMapper voyageStockDistributeNewMapper;
@@ -84,7 +85,7 @@ public class VoyageApiImpl implements VoyageApi{
         try {
             lock.lock(60, TimeUnit.SECONDS);
             Integer type = reqDTO.getType();//判断是分销商还是门店下单 1：分销商，2：门店
-            if (type == DistributorOrStoreEnum.DISTRIBUTOR.getValue()) {//分销商下单，当前阶段不考虑门店下单
+            if (Objects.equals(type, DistributorOrStoreEnum.DISTRIBUTOR.getValue())) {//分销商下单，当前阶段不考虑门店下单
                 //分销商下单只扣分销商库存，默认是OTA，默认OTC只能门店下单
                 //初定扣分销商库存
                 //先返还初定扣的库存
@@ -92,8 +93,8 @@ public class VoyageApiImpl implements VoyageApi{
                 //再去扣初定的库存
                 preReduceStockDistributor(reqDTO);
             }
-        }finally {
-            if(lock.isHeldByCurrentThread() && lock.isLocked()){
+        } finally {
+            if (lock.isHeldByCurrentThread() && lock.isLocked()) {
                 lock.unlock();
             }
         }
@@ -111,13 +112,13 @@ public class VoyageApiImpl implements VoyageApi{
         try {
             lock.lock(60, TimeUnit.SECONDS);
             Integer type = reqDTO.getType();//判断是分销商还是门店下单 1：分销商，2：门店
-            if (type == DistributorOrStoreEnum.DISTRIBUTOR.getValue()) {//分销商下单，当前阶段不考虑门店下单
+            if (Objects.equals(type, DistributorOrStoreEnum.DISTRIBUTOR.getValue())) {//分销商下单，当前阶段不考虑门店下单
                 //分销商下单只扣分销商库存，默认是OTA，默认OTC只能门店下单
                 //初定扣分销商库存
                 preCancelReduceStockDistributor(reqDTO.getOrderId(), reqDTO.getType());
             }
-        }finally {
-            if(lock.isHeldByCurrentThread() && lock.isLocked()){
+        } finally {
+            if (lock.isHeldByCurrentThread() && lock.isLocked()) {
                 lock.unlock();
             }
         }
@@ -135,7 +136,7 @@ public class VoyageApiImpl implements VoyageApi{
         try {
             lock.lock(60, TimeUnit.SECONDS);
             Integer type = reqDTO.getType();//判断是分销商还是门店下单 1：分销商，2：门店
-            if (type == DistributorOrStoreEnum.DISTRIBUTOR.getValue()) {//分销商下单，当前阶段不考虑门店下单
+            if (Objects.equals(type, DistributorOrStoreEnum.DISTRIBUTOR.getValue())) {//分销商下单，当前阶段不考虑门店下单
                 //分销商下单只扣分销商库存，默认是OTA，默认OTC只能门店下单
                 //初定扣分销商库存
                 //先返还初定扣的库存
@@ -143,8 +144,8 @@ public class VoyageApiImpl implements VoyageApi{
                 //再去扣确定的库存
                 reduceStockDistributor(reqDTO);
             }
-        }finally {
-            if(lock.isHeldByCurrentThread() && lock.isLocked()){
+        } finally {
+            if (lock.isHeldByCurrentThread() && lock.isLocked()) {
                 lock.unlock();
             }
         }
@@ -161,13 +162,13 @@ public class VoyageApiImpl implements VoyageApi{
         try {
             lock.lock(60, TimeUnit.SECONDS);
             Integer type = reqDTO.getType();//判断是分销商还是门店下单 1：分销商，2：门店
-            if (type == DistributorOrStoreEnum.DISTRIBUTOR.getValue()) {//分销商下单，当前阶段不考虑门店下单
+            if (Objects.equals(type, DistributorOrStoreEnum.DISTRIBUTOR.getValue())) {//分销商下单，当前阶段不考虑门店下单
                 //分销商下单只扣分销商库存，默认是OTA，默认OTC只能门店下单
                 //初定扣分销商库存
                 cancelReduceStockDistributor(reqDTO.getOrderId(), reqDTO.getType());
             }
-        }finally {
-            if(lock.isHeldByCurrentThread() && lock.isLocked()){
+        } finally {
+            if (lock.isHeldByCurrentThread() && lock.isLocked()) {
                 lock.unlock();
             }
         }
@@ -175,14 +176,12 @@ public class VoyageApiImpl implements VoyageApi{
 
     /**
      * 确定状态时取消订单还库存
-     * @param orderId
-     * @param type
      */
     private void cancelReduceStockDistributor(Long orderId, Integer type) {
         //退还航次总库存
         //找到确定时扣库存的记录
         VoyageStockLogDO voyageStockLogDO = voyageStockLogMapper.selectByOrder(orderId, TradeOrderStatusEnum.UNUSED.getStatus());
-        if(voyageStockLogDO != null){
+        if (voyageStockLogDO != null) {
             //删除已使用房间记录
             voyageStockRoomUsedMapper.deleteByOrderId(orderId);
             Long voyageId = voyageStockLogDO.getVoyageId();
@@ -198,7 +197,7 @@ public class VoyageApiImpl implements VoyageApi{
             voyageStockMapper.updateById(stockDO);//更新航次总库存
             //删除航次库存操作记录
             voyageStockLogMapper.deleteById(voyageStockLogDO);
-        }else {
+        } else {
             log.error("订单取消时，未找到对应的航次库存操作记录，订单ID：{}", orderId);
             return;
         }
@@ -206,7 +205,7 @@ public class VoyageApiImpl implements VoyageApi{
         Long distributorId = voyageStockLogDO.getDistributorId();
         //找到初定时扣库存详情的记录
         List<VoyageStockDetailLogDO> detailLogList = voyageStockDetailLogMapper.selectListByOrder(orderId, TradeOrderStatusEnum.UNUSED.getStatus());
-        if(detailLogList != null && detailLogList.size() > 0) {
+        if (detailLogList != null && !detailLogList.isEmpty()) {
             //退还航次库存详情
             List<VoyageStockDetailDO> stockDetailList = voyageStockDetailMapper.selectListByVoyageId(voyageId);
             Map<String, BigDecimal> realNumMap = CollectionUtils.convertMap(detailLogList, item -> item.getRoomModelId() + "_" + item.getFloor(), VoyageStockDetailLogDO::getRealNum);
@@ -214,7 +213,7 @@ public class VoyageApiImpl implements VoyageApi{
             Map<String, BigDecimal> shareNumMap = CollectionUtils.convertMap(detailLogList, item -> item.getRoomModelId() + "_" + item.getFloor(), VoyageStockDetailLogDO::getShareNum);
             Map<String, BigDecimal> totalNumMap = CollectionUtils.convertMap(detailLogList, item -> item.getRoomModelId() + "_" + item.getFloor(), item -> item.getRealNum().add(item.getVirtualNum()));
 
-            stockDetailList.stream().forEach(item -> {
+            stockDetailList.forEach(item -> {
                 String key = item.getRoomModelId() + "_" + item.getFloor();
                 item.setBookNum(item.getBookNum().subtract(totalNumMap.get(key)));
                 item.setCanSellNum(item.getCanSellNum().add(totalNumMap.get(key)));
@@ -225,16 +224,16 @@ public class VoyageApiImpl implements VoyageApi{
 
             Integer stockType = detailLogList.get(0).getStockType();
 
-            if(stockType == 2) { //2：还分销商库存
+            if (stockType == 2) { //2：还分销商库存
                 //判断分销商库存是否存在
                 VoyageStockDistributeNewDetailReqVO detailReqVO = new VoyageStockDistributeNewDetailReqVO();
                 detailReqVO.setVoyageId(voyageId);
                 detailReqVO.setType(type);
                 detailReqVO.setObjectId(distributorId);
-                List<VoyageStockDistributeNewRespVO> distributeNewRespVOS =  voyageStockDistributeNewService.getDetail(detailReqVO);
+                List<VoyageStockDistributeNewRespVO> distributeNewRespVOS = voyageStockDistributeNewService.getDetail(detailReqVO);
                 List<VoyageStockDistributeNewDO> list = BeanUtils.toBean(distributeNewRespVOS, VoyageStockDistributeNewDO.class);
-                if(list != null && list.size() > 0) {
-                    list.stream().forEach(item -> {
+                if (list != null && !list.isEmpty()) {
+                    list.forEach(item -> {
                         String key = item.getRoomModelId() + "_" + item.getFloor();
                         item.setNum(item.getNum().add(totalNumMap.get(key)));
                         item.setBookNum(item.getBookNum().subtract(totalNumMap.get(key)));
@@ -250,6 +249,7 @@ public class VoyageApiImpl implements VoyageApi{
 
     /**
      * 确定时扣库存,有限扣实际库存，不足再扣虚拟库存
+     *
      * @param reqDTO
      */
     private void reduceStockDistributor(ReduceStockReqDTO reqDTO) {
@@ -275,7 +275,7 @@ public class VoyageApiImpl implements VoyageApi{
         voyageStockLogDO.setStoreId(storeId);
         // 获取航次总库存
         VoyageStockDO stockDO = voyageStockMapper.selectById(voyageId);
-        if(stockDO == null) {
+        if (stockDO == null) {
             throw exception(VOYAGE_NO_STOCK);
         }
         //共享库存
@@ -289,7 +289,7 @@ public class VoyageApiImpl implements VoyageApi{
         detailReqVO.setVoyageId(voyageId);
         detailReqVO.setType(type);
         detailReqVO.setObjectId(distributorId);
-        List<VoyageStockDistributeNewRespVO> distributeNewRespVOS =  voyageStockDistributeNewService.getDetail(detailReqVO);
+        List<VoyageStockDistributeNewRespVO> distributeNewRespVOS = voyageStockDistributeNewService.getDetail(detailReqVO);
         List<OrderRoomUseDTO> orderRoomList = reqDTO.getOrderRoomList();//订单使用房间详情
         List<Long> roomIds = CollectionUtils.convertList(orderRoomList, OrderRoomUseDTO::getRoomId);
         List<RoomRespDTO> roomList = roomApi.getRoomListByIds(roomIds);
@@ -297,29 +297,29 @@ public class VoyageApiImpl implements VoyageApi{
         Map<String, BigDecimal> roomModelFloorNumMap = CollectionUtils.convertMap(roomList,
                 item -> item.getRoomModelId() + "_" + item.getFloors(),
                 item -> roomMap.get(item.getId()) == null ? BigDecimal.ZERO : roomMap.get(item.getId()));
-        if(distributeNewRespVOS.isEmpty()) {//分销商未分配库存，扣共享库存
+        if (distributeNewRespVOS.isEmpty()) {//分销商未分配库存，扣共享库存
 
             voyageStockLogDO.setStockType(1); //1共享库存
             //判断共享库存是否充足
-            if(shareNum.compareTo(totalUseNum) < 0) {
+            if (shareNum.compareTo(totalUseNum) < 0) {
                 throw exception(VOYAGE_SHARE_STOCK_NOT_ENOUGH);
             }
             //判断航次房型楼层库存是否充足
             // 判断库存是否充足
-            stockDetailList.stream().forEach(item -> {
+            stockDetailList.forEach(item -> {
                 BigDecimal canSellNum = item.getCanSellNum();
                 BigDecimal useNum = roomModelFloorNumMap.get(item.getRoomModelId() + "_" + item.getFloor());
-                if(useNum == null) {
+                if (useNum == null) {
                     useNum = BigDecimal.ZERO;
                 }
-                if(canSellNum.compareTo(useNum) < 0) {
+                if (canSellNum.compareTo(useNum) < 0) {
                     throw exception(VOYAGE_SHARE_ROOM_NOT_ENOUGH.getCode(), String.format(VOYAGE_SHARE_ROOM_NOT_ENOUGH.getMsg(), item.getRoomModelName(), item.getFloor()));
                 }
             });
             // 库存充足，扣库存详情
-            stockDetailList.stream().forEach(item -> {
+            stockDetailList.forEach(item -> {
                 BigDecimal useNum = roomModelFloorNumMap.get(item.getRoomModelId() + "_" + item.getFloor());
-                if(useNum == null) {
+                if (useNum == null) {
                     useNum = BigDecimal.ZERO;
                 }
                 //航次库存详情操作日志
@@ -339,11 +339,11 @@ public class VoyageApiImpl implements VoyageApi{
                 // 减可售房间数
                 item.setCanSellNum(item.getCanSellNum().subtract(useNum));
                 // 减实际房间数，此处确定，先扣实际库存，实际库存不足再扣细虚拟库存
-                if(item.getRealTotalNum().compareTo(useNum) >= 0) {
+                if (item.getRealTotalNum().compareTo(useNum) >= 0) {
                     voyageStockDetailLogDO.setVirtualNum(BigDecimal.ZERO);
                     voyageStockDetailLogDO.setRealNum(useNum);
                     item.setRealTotalNum(item.getRealTotalNum().subtract(useNum));
-                }else {
+                } else {
                     voyageStockDetailLogDO.setVirtualNum(useNum.subtract(item.getRealTotalNum()));
                     voyageStockDetailLogDO.setRealNum(useNum);
                     item.setRealTotalNum(BigDecimal.ZERO);
@@ -363,11 +363,11 @@ public class VoyageApiImpl implements VoyageApi{
             // 减可售房间数
             stockDO.setCanSellNum(stockDO.getCanSellNum().subtract(totalUseNum));
             // 减实际房间数，此处确定，先扣实际库存，实际库存不足再扣虚拟库存
-            if(stockDO.getRealTotalNum().compareTo(totalUseNum) >= 0) {
+            if (stockDO.getRealTotalNum().compareTo(totalUseNum) >= 0) {
                 stockDO.setRealTotalNum(stockDO.getRealTotalNum().subtract(totalUseNum));
                 voyageStockLogDO.setVirtualNum(BigDecimal.ZERO);
                 voyageStockLogDO.setRealNum(totalUseNum);
-            }else {
+            } else {
                 voyageStockLogDO.setRealNum(stockDO.getRealTotalNum());
                 voyageStockLogDO.setVirtualNum(totalUseNum.subtract(voyageStockLogDO.getRealNum()));
                 stockDO.setRealTotalNum(BigDecimal.ZERO);
@@ -380,29 +380,29 @@ public class VoyageApiImpl implements VoyageApi{
             stockDO.setShareNum(stockDO.getShareNum().subtract(totalUseNum));
             voyageStockLogDO.setShareNum(totalUseNum);
             voyageStockMapper.updateById(stockDO);
-        }else {
+        } else {
 
             voyageStockLogDO.setStockType(2); //2分销商库存
 
             //分销商已分配库存，扣自身库存
 
             //判断航次房型楼层库存是否充足
-            distributeNewRespVOS.stream().forEach(item -> {
+            distributeNewRespVOS.forEach(item -> {
                 BigDecimal canSellNum = item.getNum();
                 BigDecimal useNum = roomModelFloorNumMap.get(item.getRoomModelId() + "_" + item.getFloor());
-                if(useNum == null) {
+                if (useNum == null) {
                     useNum = BigDecimal.ZERO;
                 }
-                if(canSellNum.compareTo(useNum) < 0) {
+                if (canSellNum.compareTo(useNum) < 0) {
                     throw exception(VOYAGE_DISTRIBUTOR_ROOM_NOT_ENOUGH.getCode(), String.format(VOYAGE_DISTRIBUTOR_ROOM_NOT_ENOUGH.getMsg(), item.getRoomModelName(), item.getFloor()));
                 }
             });
             // 扣分销商库存
             // 库存充足，扣库存详情
             List<VoyageStockDistributeNewDO> list = BeanUtils.toBean(distributeNewRespVOS, VoyageStockDistributeNewDO.class);
-            list.stream().forEach(item -> {
+            list.forEach(item -> {
                 BigDecimal useNum = roomModelFloorNumMap.get(item.getRoomModelId() + "_" + item.getFloor());
-                if(useNum == null) {
+                if (useNum == null) {
                     useNum = BigDecimal.ZERO;
                 }
                 // 减可售房间数
@@ -414,9 +414,9 @@ public class VoyageApiImpl implements VoyageApi{
             voyageStockDistributeNewMapper.updateBatch(list);
 
             // 库存充足，扣库存详情
-            stockDetailList.stream().forEach(item -> {
+            stockDetailList.forEach(item -> {
                 BigDecimal useNum = roomModelFloorNumMap.get(item.getRoomModelId() + "_" + item.getFloor());
-                if(useNum == null) {
+                if (useNum == null) {
                     useNum = BigDecimal.ZERO;
                 }
 
@@ -436,11 +436,11 @@ public class VoyageApiImpl implements VoyageApi{
                 // 减可售房间数
                 item.setCanSellNum(item.getCanSellNum().subtract(useNum));
                 // 减实际房间数，此处确定，先扣实际库存，实际库存不足再扣实际库存
-                if(item.getVirtualNum().compareTo(useNum) >= 0) {
+                if (item.getVirtualNum().compareTo(useNum) >= 0) {
                     voyageStockDetailLogDO.setRealNum(useNum);
                     voyageStockDetailLogDO.setVirtualNum(BigDecimal.ZERO);
                     item.setRealTotalNum(item.getRealTotalNum().subtract(useNum));
-                }else {
+                } else {
                     voyageStockDetailLogDO.setRealNum(item.getRealTotalNum());
                     voyageStockDetailLogDO.setVirtualNum(totalUseNum.subtract(item.getRealTotalNum()));
                     item.setRealTotalNum(BigDecimal.ZERO);
@@ -461,11 +461,11 @@ public class VoyageApiImpl implements VoyageApi{
             // 减剩余房间数
 //            stockDO.setSurplusNum(stockDO.getSurplusNum().subtract(totalUseNum));
             // 减实际房间数，此处确定，先扣实际库存，实际库存不足再扣虚拟库存
-            if(stockDO.getRealTotalNum().compareTo(totalUseNum) >= 0) {
+            if (stockDO.getRealTotalNum().compareTo(totalUseNum) >= 0) {
                 stockDO.setRealTotalNum(stockDO.getRealTotalNum().subtract(totalUseNum));
                 voyageStockLogDO.setRealNum(totalUseNum);
                 voyageStockLogDO.setVirtualNum(BigDecimal.ZERO);
-            }else {
+            } else {
                 voyageStockLogDO.setRealNum(stockDO.getRealTotalNum());
                 voyageStockLogDO.setVirtualNum(totalUseNum.subtract(voyageStockLogDO.getRealNum()));
                 stockDO.setRealTotalNum(BigDecimal.ZERO);
@@ -486,7 +486,7 @@ public class VoyageApiImpl implements VoyageApi{
             roomUsedDO.setOrderId(orderId);
             roomUsedDO.setVoyageId(voyageId);
             RoomRespDTO roomRespDTO = roomIdMap.get(item.getRoomId());
-            if(roomRespDTO == null) {
+            if (roomRespDTO == null) {
                 throw exception(VOYAGE_ROOM_NOT_EXIST.getCode(), String.format(VOYAGE_ROOM_NOT_EXIST.getMsg(), item.getRoomId()));
             }
             roomUsedDO.setRoomModelId(roomRespDTO.getRoomModelId());
@@ -498,14 +498,14 @@ public class VoyageApiImpl implements VoyageApi{
         });
         //先删除当前订单已被使用的房间
         voyageStockRoomUsedMapper.deleteByOrderId(orderId);
-        if(roomUsedList.size() > 0) {
+        if (!roomUsedList.isEmpty()) {
             voyageStockRoomUsedMapper.insertBatch(roomUsedList);
         }
 
         // 添加库存日志
         voyageStockLogMapper.insert(voyageStockLogDO);
         // 添加库存详情日志
-        if(detailLogList.size() > 0) {
+        if (!detailLogList.isEmpty()) {
             voyageStockDetailLogMapper.insertBatch(detailLogList);
         }
     }
@@ -517,7 +517,7 @@ public class VoyageApiImpl implements VoyageApi{
         //退还航次总库存
         //找到初定时扣库存的记录
         VoyageStockLogDO voyageStockLogDO = voyageStockLogMapper.selectByOrder(orderId, TradeOrderStatusEnum.YD.getStatus());
-        if(voyageStockLogDO != null){
+        if (voyageStockLogDO != null) {
             //删除已使用房间记录
             voyageStockRoomUsedMapper.deleteByOrderId(orderId);
             Long voyageId = voyageStockLogDO.getVoyageId();
@@ -533,7 +533,7 @@ public class VoyageApiImpl implements VoyageApi{
             voyageStockMapper.updateById(stockDO);//更新航次总库存
             //删除航次库存操作记录
             voyageStockLogMapper.deleteById(voyageStockLogDO);
-        }else {
+        } else {
             log.error("订单取消时，未找到对应的航次库存操作记录，订单ID：{}", orderId);
             return;
         }
@@ -541,7 +541,7 @@ public class VoyageApiImpl implements VoyageApi{
         Long distributorId = voyageStockLogDO.getDistributorId();
         //找到初定时扣库存详情的记录
         List<VoyageStockDetailLogDO> detailLogList = voyageStockDetailLogMapper.selectListByOrder(orderId, TradeOrderStatusEnum.YD.getStatus());
-        if(detailLogList != null && detailLogList.size() > 0) {
+        if (detailLogList != null && !detailLogList.isEmpty()) {
             //退还航次库存详情
             List<VoyageStockDetailDO> stockDetailList = voyageStockDetailMapper.selectListByVoyageId(voyageId);
             Map<String, BigDecimal> realNumMap = CollectionUtils.convertMap(detailLogList, item -> item.getRoomModelId() + "_" + item.getFloor(), VoyageStockDetailLogDO::getRealNum);
@@ -549,7 +549,7 @@ public class VoyageApiImpl implements VoyageApi{
 //            Map<String, BigDecimal> shareNumMap = CollectionUtils.convertMap(detailLogList, item -> item.getRoomModelId() + "_" + item.getFloor(), VoyageStockDetailLogDO::getShareNum);
             Map<String, BigDecimal> totalNumMap = CollectionUtils.convertMap(detailLogList, item -> item.getRoomModelId() + "_" + item.getFloor(), item -> item.getRealNum().add(item.getVirtualNum()));
 
-            stockDetailList.stream().forEach(item -> {
+            stockDetailList.forEach(item -> {
                 String key = item.getRoomModelId() + "_" + item.getFloor();
                 item.setBookNum(item.getBookNum().subtract(totalNumMap.get(key)));
                 item.setCanSellNum(item.getCanSellNum().add(totalNumMap.get(key)));
@@ -560,16 +560,16 @@ public class VoyageApiImpl implements VoyageApi{
 
             Integer stockType = detailLogList.get(0).getStockType();
 
-            if(stockType == 2) { //2：还分销商库存
+            if (stockType == 2) { //2：还分销商库存
                 //判断分销商库存是否存在
                 VoyageStockDistributeNewDetailReqVO detailReqVO = new VoyageStockDistributeNewDetailReqVO();
                 detailReqVO.setVoyageId(voyageId);
                 detailReqVO.setType(type);
                 detailReqVO.setObjectId(distributorId);
-                List<VoyageStockDistributeNewRespVO> distributeNewRespVOS =  voyageStockDistributeNewService.getDetail(detailReqVO);
+                List<VoyageStockDistributeNewRespVO> distributeNewRespVOS = voyageStockDistributeNewService.getDetail(detailReqVO);
                 List<VoyageStockDistributeNewDO> list = BeanUtils.toBean(distributeNewRespVOS, VoyageStockDistributeNewDO.class);
-                if(list != null && list.size() > 0) {
-                    list.stream().forEach(item -> {
+                if (list != null && !list.isEmpty()) {
+                    list.forEach(item -> {
                         String key = item.getRoomModelId() + "_" + item.getFloor();
                         item.setNum(item.getNum().add(totalNumMap.get(key)));
                         item.setBookNum(item.getBookNum().subtract(totalNumMap.get(key)));
@@ -583,14 +583,11 @@ public class VoyageApiImpl implements VoyageApi{
         }
 
 
-
-
-
-
     }
 
     /**
      * 初定扣分销商库存
+     *
      * @param reqDTO
      */
     private void preReduceStockDistributor(ReduceStockReqDTO reqDTO) {
@@ -616,7 +613,7 @@ public class VoyageApiImpl implements VoyageApi{
         voyageStockLogDO.setStoreId(storeId);
         // 获取航次总库存
         VoyageStockDO stockDO = voyageStockMapper.selectById(voyageId);
-        if(stockDO == null) {
+        if (stockDO == null) {
             throw exception(VOYAGE_NO_STOCK);
         }
         //共享库存
@@ -630,7 +627,7 @@ public class VoyageApiImpl implements VoyageApi{
         detailReqVO.setVoyageId(voyageId);
         detailReqVO.setType(type);
         detailReqVO.setObjectId(distributorId);
-        List<VoyageStockDistributeNewRespVO> distributeNewRespVOS =  voyageStockDistributeNewService.getDetail(detailReqVO);
+        List<VoyageStockDistributeNewRespVO> distributeNewRespVOS = voyageStockDistributeNewService.getDetail(detailReqVO);
         List<OrderRoomUseDTO> orderRoomList = reqDTO.getOrderRoomList();//订单使用房间详情
         List<Long> roomIds = CollectionUtils.convertList(orderRoomList, OrderRoomUseDTO::getRoomId);
         List<RoomRespDTO> roomList = roomApi.getRoomListByIds(roomIds);
@@ -638,29 +635,29 @@ public class VoyageApiImpl implements VoyageApi{
         Map<String, BigDecimal> roomModelFloorNumMap = CollectionUtils.convertMap(roomList,
                 item -> item.getRoomModelId() + "_" + item.getFloors(),
                 item -> roomMap.get(item.getId()) == null ? BigDecimal.ZERO : roomMap.get(item.getId()));
-        if(distributeNewRespVOS.isEmpty()) {//分销商未分配库存，扣共享库存
+        if (distributeNewRespVOS.isEmpty()) {//分销商未分配库存，扣共享库存
 
             voyageStockLogDO.setStockType(1); //1共享库存
             //判断共享库存是否充足
-            if(shareNum.compareTo(totalUseNum) < 0) {
+            if (shareNum.compareTo(totalUseNum) < 0) {
                 throw exception(VOYAGE_SHARE_STOCK_NOT_ENOUGH);
             }
             //判断航次房型楼层库存是否充足
             // 判断库存是否充足
-            stockDetailList.stream().forEach(item -> {
+            stockDetailList.forEach(item -> {
                 BigDecimal canSellNum = item.getCanSellNum();
                 BigDecimal useNum = roomModelFloorNumMap.get(item.getRoomModelId() + "_" + item.getFloor());
-                if(useNum == null) {
+                if (useNum == null) {
                     useNum = BigDecimal.ZERO;
                 }
-                if(canSellNum.compareTo(useNum) < 0) {
+                if (canSellNum.compareTo(useNum) < 0) {
                     throw exception(VOYAGE_SHARE_ROOM_NOT_ENOUGH.getCode(), String.format(VOYAGE_SHARE_ROOM_NOT_ENOUGH.getMsg(), item.getRoomModelName(), item.getFloor()));
                 }
             });
             // 库存充足，扣库存详情
-            stockDetailList.stream().forEach(item -> {
+            stockDetailList.forEach(item -> {
                 BigDecimal useNum = roomModelFloorNumMap.get(item.getRoomModelId() + "_" + item.getFloor());
-                if(useNum == null) {
+                if (useNum == null) {
                     useNum = BigDecimal.ZERO;
                 }
                 //航次库存详情操作日志
@@ -680,11 +677,11 @@ public class VoyageApiImpl implements VoyageApi{
                 // 减可售房间数
                 item.setCanSellNum(item.getCanSellNum().subtract(useNum));
                 // 减虚拟房间数，此处初定，先扣虚拟库存，虚拟库存不足再扣实际库存
-                if(item.getVirtualNum().compareTo(useNum) >= 0) {
+                if (item.getVirtualNum().compareTo(useNum) >= 0) {
                     voyageStockDetailLogDO.setVirtualNum(useNum);
                     voyageStockDetailLogDO.setRealNum(BigDecimal.ZERO);
                     item.setVirtualNum(item.getVirtualNum().subtract(useNum));
-                }else {
+                } else {
                     voyageStockDetailLogDO.setVirtualNum(item.getVirtualNum());
                     voyageStockDetailLogDO.setRealNum(useNum.subtract(item.getVirtualNum()));
                     item.setVirtualNum(BigDecimal.ZERO);
@@ -704,11 +701,11 @@ public class VoyageApiImpl implements VoyageApi{
             // 减可售房间数
             stockDO.setCanSellNum(stockDO.getCanSellNum().subtract(totalUseNum));
             // 减虚拟房间数，此处初定，先扣虚拟库存，虚拟库存不足再扣实际库存
-            if(stockDO.getVirtualNum().compareTo(totalUseNum) >= 0) {
+            if (stockDO.getVirtualNum().compareTo(totalUseNum) >= 0) {
                 stockDO.setVirtualNum(stockDO.getVirtualNum().subtract(totalUseNum));
                 voyageStockLogDO.setVirtualNum(totalUseNum);
                 voyageStockLogDO.setRealNum(BigDecimal.ZERO);
-            }else {
+            } else {
                 voyageStockLogDO.setVirtualNum(stockDO.getVirtualNum());
                 voyageStockLogDO.setRealNum(totalUseNum.subtract(voyageStockLogDO.getVirtualNum()));
                 stockDO.setVirtualNum(BigDecimal.ZERO);
@@ -721,43 +718,47 @@ public class VoyageApiImpl implements VoyageApi{
             stockDO.setShareNum(stockDO.getShareNum().subtract(totalUseNum));
             voyageStockLogDO.setShareNum(totalUseNum);
             voyageStockMapper.updateById(stockDO);
-        }else {
+        } else {
 
             voyageStockLogDO.setStockType(2); //2分销商库存
 
             //分销商已分配库存，扣自身库存
 
             //判断航次房型楼层库存是否充足
-            distributeNewRespVOS.stream().forEach(item -> {
+            distributeNewRespVOS.forEach(item -> {
                 BigDecimal canSellNum = item.getNum();
                 BigDecimal useNum = roomModelFloorNumMap.get(item.getRoomModelId() + "_" + item.getFloor());
-                if(useNum == null) {
+                if (useNum == null) {
                     useNum = BigDecimal.ZERO;
                 }
-                if(canSellNum.compareTo(useNum) < 0) {
+                if (canSellNum.compareTo(useNum) < 0) {
                     throw exception(VOYAGE_DISTRIBUTOR_ROOM_NOT_ENOUGH.getCode(), String.format(VOYAGE_DISTRIBUTOR_ROOM_NOT_ENOUGH.getMsg(), item.getRoomModelName(), item.getFloor()));
                 }
             });
             // 扣分销商库存
             // 库存充足，扣库存详情
             List<VoyageStockDistributeNewDO> list = BeanUtils.toBean(distributeNewRespVOS, VoyageStockDistributeNewDO.class);
-            list.stream().forEach(item -> {
+            list.forEach(item -> {
                 BigDecimal useNum = roomModelFloorNumMap.get(item.getRoomModelId() + "_" + item.getFloor());
-                if(useNum == null) {
+                if (useNum == null) {
                     useNum = BigDecimal.ZERO;
                 }
                 // 减可售房间数
                 item.setNum(item.getNum().subtract(useNum));
                 // 加预定房间数
-                item.setBookNum(item.getBookNum().add(useNum));
+                if (item.getBookNum() != null) {
+                    item.setBookNum(item.getBookNum().add(useNum));
+                } else {
+                    item.setBookNum(useNum);
+                }
             });
 
             voyageStockDistributeNewMapper.updateBatch(list);
 
             // 库存充足，扣库存详情
-            stockDetailList.stream().forEach(item -> {
+            stockDetailList.forEach(item -> {
                 BigDecimal useNum = roomModelFloorNumMap.get(item.getRoomModelId() + "_" + item.getFloor());
-                if(useNum == null) {
+                if (useNum == null) {
                     useNum = BigDecimal.ZERO;
                 }
 
@@ -777,11 +778,11 @@ public class VoyageApiImpl implements VoyageApi{
                 // 减可售房间数
                 item.setCanSellNum(item.getCanSellNum().subtract(useNum));
                 // 减虚拟房间数，此处初定，先扣虚拟库存，虚拟库存不足再扣实际库存
-                if(item.getVirtualNum().compareTo(useNum) >= 0) {
+                if (item.getVirtualNum().compareTo(useNum) >= 0) {
                     voyageStockDetailLogDO.setVirtualNum(useNum);
                     voyageStockDetailLogDO.setRealNum(BigDecimal.ZERO);
                     item.setVirtualNum(item.getVirtualNum().subtract(useNum));
-                }else {
+                } else {
                     voyageStockDetailLogDO.setVirtualNum(item.getVirtualNum());
                     voyageStockDetailLogDO.setRealNum(totalUseNum.subtract(item.getVirtualNum()));
                     item.setVirtualNum(BigDecimal.ZERO);
@@ -802,11 +803,11 @@ public class VoyageApiImpl implements VoyageApi{
             // 减剩余房间数
 //            stockDO.setSurplusNum(stockDO.getSurplusNum().subtract(totalUseNum));
             // 减虚拟房间数，此处初定，先扣虚拟库存，虚拟库存不足再扣实际库存
-            if(stockDO.getVirtualNum().compareTo(totalUseNum) >= 0) {
+            if (stockDO.getVirtualNum().compareTo(totalUseNum) >= 0) {
                 stockDO.setVirtualNum(stockDO.getVirtualNum().subtract(totalUseNum));
                 voyageStockLogDO.setVirtualNum(totalUseNum);
                 voyageStockLogDO.setRealNum(BigDecimal.ZERO);
-            }else {
+            } else {
                 voyageStockLogDO.setVirtualNum(stockDO.getVirtualNum());
                 voyageStockLogDO.setRealNum(totalUseNum.subtract(voyageStockLogDO.getVirtualNum()));
                 stockDO.setVirtualNum(BigDecimal.ZERO);
@@ -827,7 +828,7 @@ public class VoyageApiImpl implements VoyageApi{
             roomUsedDO.setOrderId(orderId);
             roomUsedDO.setVoyageId(voyageId);
             RoomRespDTO roomRespDTO = roomIdMap.get(item.getRoomId());
-            if(roomRespDTO == null) {
+            if (roomRespDTO == null) {
                 throw exception(VOYAGE_ROOM_NOT_EXIST.getCode(), String.format(VOYAGE_ROOM_NOT_EXIST.getMsg(), item.getRoomId()));
             }
             roomUsedDO.setRoomModelId(roomRespDTO.getRoomModelId());
@@ -839,14 +840,14 @@ public class VoyageApiImpl implements VoyageApi{
         });
         //先删除当前订单已被使用的房间
         voyageStockRoomUsedMapper.deleteByOrderId(orderId);
-        if(roomUsedList.size() > 0) {
+        if (!roomUsedList.isEmpty()) {
             voyageStockRoomUsedMapper.insertBatch(roomUsedList);
         }
 
         // 添加库存日志
         voyageStockLogMapper.insert(voyageStockLogDO);
         // 添加库存详情日志
-        if(detailLogList.size() > 0) {
+        if (!detailLogList.isEmpty()) {
             voyageStockDetailLogMapper.insertBatch(detailLogList);
         }
     }

ship-module-product/ship-module-product-biz/src/main/java/com/yc/ship/module/product/service/voyagestockdistribute/VoyageStockDistributeNewServiceImpl.java

@@ -177,9 +177,9 @@ public class VoyageStockDistributeNewServiceImpl implements VoyageStockDistribut
         //TODO:此处当前默认为1分销商，暂无门店
         type = DistributorOrStoreEnum.DISTRIBUTOR.getValue();
         List<VoyageStockDistributeRoomDO> roomList;
-        if(type == DistributorOrStoreEnum.DISTRIBUTOR.getValue()) {
+        if(type.equals(DistributorOrStoreEnum.DISTRIBUTOR.getValue())) {
             roomList = voyageStockDistributeRoomService.getRoomListByRoomModelIdAndFloor(reqVO.getDistributorId(), reqVO.getRoomModelIdFloorList());
-        }else if(type == DistributorOrStoreEnum.STORE.getValue()) {
+        }else if(type.equals(DistributorOrStoreEnum.STORE.getValue())) {
             roomList = voyageStockDistributeRoomService.getRoomListByRoomModelIdAndFloor(reqVO.getStoreId(), reqVO.getRoomModelIdFloorList());
         }else {
             roomList = new ArrayList<>();

ship-module-resource/ship-module-resource-api/src/main/java/com/yc/ship/module/resource/enums/CarStatusEnum.java

@@ -18,6 +18,7 @@ public enum CarStatusEnum implements IntArrayValuable {
     private final Integer status;
     private final String name;
 
+    @Override
     public int[] array() {
         return ARRAYS;
     }

ship-module-resource/ship-module-resource-api/src/main/java/com/yc/ship/module/resource/enums/DeleteStatusEnum.java

@@ -12,6 +12,7 @@ public enum DeleteStatusEnum implements IntArrayValuable {
     private final Integer status;
     private final String name;
 
+    @Override
     public int[] array() {
         return ARRAYS;
     }

ship-module-resource/ship-module-resource-api/src/main/java/com/yc/ship/module/resource/enums/guide/GuideRefundStatusEnum.java

@@ -31,6 +31,7 @@ public enum GuideRefundStatusEnum implements IntArrayValuable {
     private final Integer status;
     private final String name;
 
+    @Override
     public int[] array() {
         return ARRAYS;
     }

ship-module-resource/ship-module-resource-api/src/main/java/com/yc/ship/module/resource/enums/guide/GuideTaskPrintStatusEnum.java

@@ -14,6 +14,7 @@ public enum GuideTaskPrintStatusEnum implements IntArrayValuable {
     private final Integer status;
     private final String name;
 
+    @Override
     public int[] array() {
         return ARRAYS;
     }

ship-module-resource/ship-module-resource-api/src/main/java/com/yc/ship/module/resource/enums/guide/GuideTypeEnum.java

@@ -16,6 +16,7 @@ public enum GuideTypeEnum implements IntArrayValuable {
     private final Integer status;
     private final String name;
 
+    @Override
     public int[] array() {
         return ARRAYS;
     }

ship-module-resource/ship-module-resource-api/src/main/java/com/yc/ship/module/resource/enums/guide/GuideUseNeedStatusEnum.java

@@ -18,6 +18,7 @@ public enum GuideUseNeedStatusEnum implements IntArrayValuable {
     private final Integer status;
     private final String name;
 
+    @Override
     public int[] array() {
         return ARRAYS;
     }

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/helper/RoomNumberHelper.java

@@ -49,7 +49,9 @@ public class RoomNumberHelper {
      */
     private static String formatNumber(long number, int length) {
         String numStr = String.valueOf(number); 
-        if (numStr.length()  >= length) return numStr;
+        if (numStr.length()  >= length) {
+            return numStr;
+        }
         
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < length - numStr.length();  i++) {

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/car/CarServiceImpl.java

@@ -124,6 +124,7 @@ public class CarServiceImpl implements CarService {
     }
 
 
+    @Override
     public List<CarDO> getCarList() {
         return this.getCarList(new CarReqVO());
     }
@@ -136,6 +137,7 @@ public class CarServiceImpl implements CarService {
     }
 
 
+    @Override
     public List<CarTypeNumRespVO> getstatiscisCarTypeNum(){
         return carMapper.getstatiscisCarTypeNum();
     };

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/driver/DriverServiceImpl.java

@@ -45,7 +45,7 @@ public class DriverServiceImpl implements DriverService {
         // 创建系统用户
         AdminUserRespDTO adminDto = new AdminUserRespDTO();
         adminDto.setNickname(createReqVO.getName());
-        adminDto.setUsername(PinyinUtil.getPinyin(createReqVO.getName(),""));
+        adminDto.setUsername(PinyinUtil.getPinyin(createReqVO.getName(), ""));
         adminDto.setMobile(createReqVO.getPhone());
         adminDto.setPassword(createReqVO.getPhone());
         adminDto.setSex(createReqVO.getSex());
@@ -57,7 +57,7 @@ public class DriverServiceImpl implements DriverService {
             driver.setDeleted(false);
             driverMapper.insert(driver);
             return driver.getId();
-        }else{
+        } else {
             throw exception(ErrorCodeConstants.DRIVER_CREATE_FAILED);
         }
     }
@@ -100,13 +100,14 @@ public class DriverServiceImpl implements DriverService {
         return driverMapper.selectPage(pageReqVO);
     }
 
+    @Override
     public List<DriverDO> getDriverList() {
         return this.getDriverList(new DriverSimpleRespVO());
     }
 
     @Override
     public List<DriverDO> getDriverList(DriverSimpleRespVO respVO) {
-        if(null == respVO.getUseStatus()){
+        if (null == respVO.getUseStatus()) {
             respVO.setUseStatus(UseStatusEnum.ENABLE.getStatus());
         }
         List<DriverDO> list = driverMapper.selectList(respVO);
@@ -119,6 +120,7 @@ public class DriverServiceImpl implements DriverService {
         return driverMapper.selectSimpleList();
     }
 
+    @Override
     public List<DriverRespVO> getDriverDefaultCarList(DriverReqVO reqVO) {
         reqVO.setTenantId(String.valueOf(TenantContextHolder.getTenantId()));
         return driverMapper.getDriverDefaultCarList(reqVO);

ship-module-resource/ship-module-resource-biz/src/main/java/com/yc/ship/module/resource/service/resource/util/EncryptUtils.java

@@ -17,12 +17,16 @@ public  class EncryptUtils {
 
     // Base64 ------------------
     public static String base64Enc(String src) {
-        if (src == null || src.length() == 0 || src.trim().length() == 0) return "";
+        if (src == null || src.length() == 0 || src.trim().length() == 0) {
+            return "";
+        }
         return new String(base64Enc(src.getBytes()));
     }
 
     public static String base64Dec(String src) {
-        if (src == null || src.length() == 0 || src.trim().length() == 0) return "";
+        if (src == null || src.length() == 0 || src.trim().length() == 0) {
+            return "";
+        }
         return new String(base64Dec(src.getBytes()));
     }
     public static byte[] base64Enc(byte[] bytes) {

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/enums/ContractStatusEnum.java

@@ -20,6 +20,7 @@ public enum ContractStatusEnum implements IntArrayValuable {
     private final Integer value;
     public static final int[] ARRAYS = Arrays.stream(values()).mapToInt(ContractStatusEnum::getValue).toArray();
 
+    @Override
     public int[] array() {
         return ARRAYS;
     }

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/enums/InsuranceStatusEnum.java

@@ -1,7 +1,6 @@
 package com.yc.ship.module.trade.enums;
 
 import com.yc.ship.framework.common.core.ArrayValuable;
-import com.yc.ship.framework.common.core.IntArrayValuable;
 import lombok.Getter;
 
 import java.util.Arrays;
@@ -19,6 +18,7 @@ public enum InsuranceStatusEnum implements ArrayValuable<Integer> {
     private final Integer value;
     public static final Integer[] ARRAYS = Arrays.stream(values()).map(InsuranceStatusEnum::getValue).toArray(Integer[]::new);
 
+    @Override
     public Integer[] array() {
         return ARRAYS;
     }

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

@@ -50,18 +50,18 @@ public class AdminTradeOrderController {
     public CommonResult<List<TradeOrderLogRespVO>> getOrderLogListByOrderId(Long orderId) {
         List<TradeOrderLogDO> list = tradeOrderLogService.getOrderLogListByOrderId(orderId);
         List<TradeOrderLogRespVO> tradeOrderLogRespVOS = BeanUtils.toBean(list, TradeOrderLogRespVO.class);
-        List<Long> userIds = CollectionUtils.convertList(tradeOrderLogRespVOS, TradeOrderLogRespVO::getUserId, (item) -> item.getUserType() == UserTypeEnum.ADMIN.getValue());
+        List<Long> userIds = CollectionUtils.convertList(tradeOrderLogRespVOS, TradeOrderLogRespVO::getUserId, (item) -> item.getUserType().equals(UserTypeEnum.ADMIN.getValue()));
         List<AdminUserRespDTO> userList = adminUserApi.getUserList(userIds);
         Map<Long, AdminUserRespDTO> userMap = CollectionUtils.convertMap(userList, AdminUserRespDTO::getId);
 
-        List<Long> memberIds = CollectionUtils.convertList(tradeOrderLogRespVOS, TradeOrderLogRespVO::getUserId, (item) -> item.getUserType() == UserTypeEnum.MEMBER.getValue());
+        List<Long> memberIds = CollectionUtils.convertList(tradeOrderLogRespVOS, TradeOrderLogRespVO::getUserId, (item) -> item.getUserType().equals(UserTypeEnum.MEMBER.getValue()));
         List<MemberUserRespDTO> memberList = memberUserApi.getUserList(memberIds);
         Map<Long, MemberUserRespDTO> memberMap = CollectionUtils.convertMap(memberList, MemberUserRespDTO::getId);
 
         tradeOrderLogRespVOS.stream().forEach(item -> {
-            if(item.getUserType() == UserTypeEnum.ADMIN.getValue()) {
+            if(item.getUserType().equals(UserTypeEnum.ADMIN.getValue())) {
                 MapUtils.findAndThen(userMap, item.getUserId(), user -> item.setUserName(user.getNickname()));
-            }else if(item.getUserType() == UserTypeEnum.MEMBER.getValue()) {
+            }else if(item.getUserType().equals(UserTypeEnum.MEMBER.getValue())) {
                 MapUtils.findAndThen(memberMap, item.getUserId(), member -> item.setUserName(member.getNickname()));
             }
         });

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

@@ -253,6 +253,9 @@ public class ShipTradeOrderCreateReqVO implements Serializable {
 
         @Schema(description = "房间id", example = "")
         private String roomId;
+
+        @Schema(description = "同住关系", example = "")
+        private String cohabitation;
     }
 
 

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

@@ -50,4 +50,7 @@ public class TradeVistorReqVO {
 
     @Schema(description = "房间ID")
     private String roomId;
+
+    @Schema(description = "同住关系")
+    private String cohabitation;
 }

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

@@ -99,4 +99,5 @@ public class TradeVisitorDO extends TenantBaseDO {
     private Integer cqzz;
 
     private String roomId;
+    private String cohabitation;
 }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/framework/common/EncryptUtils.java

@@ -17,12 +17,16 @@ public  class EncryptUtils {
 
     // Base64 ------------------
     public static String base64Enc(String src) {
-        if (src == null || src.length() == 0 || src.trim().length() == 0) return "";
+        if (src == null || src.length() == 0 || src.trim().length() == 0) {
+            return "";
+        }
         return new String(base64Enc(src.getBytes()));
     }
 
     public static String base64Dec(String src) {
-        if (src == null || src.length() == 0 || src.trim().length() == 0) return "";
+        if (src == null || src.length() == 0 || src.trim().length() == 0) {
+            return "";
+        }
         return new String(base64Dec(src.getBytes()));
     }
     public static byte[] base64Enc(byte[] bytes) {

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/framework/common/HexUtil.java

@@ -164,8 +164,9 @@ public class HexUtil {
     }
 
     public static byte[] parseHexStr2Byte(String hexStr) {
-        if (hexStr.length() < 1)
+        if (hexStr.length() < 1) {
             return null;
+        }
         byte[] result = new byte[hexStr.length() / 2];
         for (int i = 0; i < hexStr.length() / 2; i++) {
             int high = Integer.parseInt(hexStr.substring(i * 2, i * 2 + 1), 16);

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

@@ -924,6 +924,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
                 tradeVisitorDO.setCredentialNo(visitor.getCredentialNo());
                 tradeVisitorDO.setDeleted(false);
                 tradeVisitorDO.setNationality(visitor.getNationality());
+                tradeVisitorDO.setCohabitation(visitor.getCohabitation());
                 tradeVisitorDO.setRoomId(visitor.getRoomId());
                 tradeVisitorDO.setCreateTime(LocalDateTime.now());
                 tradeVisitorDOList.add(tradeVisitorDO);

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/ota/impl/MeiTuanServiceImpl.java

@@ -722,13 +722,13 @@ public class MeiTuanServiceImpl implements MeiTuanService, OtaService {
                         refundId, -1);
             }
             // 订单不存在或订单无效时 同意退款
-            if (order == null || order.getOrderStatus() == TradeOrderStatusEnum.CANCELED.getStatus()
-                    || order.getOrderStatus() == TradeOrderStatusEnum.FAIL.getStatus()) {
+            if (order == null || order.getOrderStatus().equals(TradeOrderStatusEnum.CANCELED.getStatus())
+                    || order.getOrderStatus().equals(TradeOrderStatusEnum.FAIL.getStatus())) {
                 return meituanReturn("200", "无效订单", distributor.getOtaAccount(), orderNo, otaOrderId,
                         refundId, -1);
-            } else if (order.getOrderStatus() == TradeOrderStatusEnum.INIT.getStatus()
-                    || order.getOrderStatus() == TradeOrderStatusEnum.UNPAID.getStatus()
-                    || order.getOrderStatus() == TradeOrderStatusEnum.PAYING.getStatus()) {
+            } else if (order.getOrderStatus().equals(TradeOrderStatusEnum.INIT.getStatus())
+                    || order.getOrderStatus().equals(TradeOrderStatusEnum.UNPAID.getStatus())
+                    || order.getOrderStatus().equals(TradeOrderStatusEnum.PAYING.getStatus())) {
                 CommonResult<?> commonResult = tradeOrderPayService.cancelOrder(order.getId());
                 if (commonResult.isSuccess()) {
                     return meituanReturn("200", "退款成功", distributor.getOtaAccount(), orderNo, otaOrderId, refundId, -1);

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/ota/impl/TiktokCalendarServiceImpl.java

@@ -1528,11 +1528,11 @@ public class TiktokCalendarServiceImpl implements TiktokCalendarService, OtaServ
             // 订单信息
             TradeOrderDO order = tradeOrderRepositoryService.getOrderByOtaAndExternalOrderNo(orderId, distributor.getId().toString());
             // 订单不存在或已过期时 订单未出票成功
-            if (order == null || order.getOrderStatus() == TradeOrderStatusEnum.CANCELED.getStatus()
-                    || order.getOrderStatus() == TradeOrderStatusEnum.FAIL.getStatus()
-                    || order.getOrderStatus() == TradeOrderStatusEnum.CANCELED.getStatus()
-                    || order.getOrderStatus() == TradeOrderStatusEnum.PROCESS_FAIL.getStatus()
-                    || order.getOrderStatus() == TradeOrderStatusEnum.EXPIRED.getStatus()) {
+            if (order == null || order.getOrderStatus().equals(TradeOrderStatusEnum.CANCELED.getStatus())
+                    || order.getOrderStatus().equals(TradeOrderStatusEnum.FAIL.getStatus())
+                    || order.getOrderStatus().equals(TradeOrderStatusEnum.CANCELED.getStatus())
+                    || order.getOrderStatus().equals(TradeOrderStatusEnum.PROCESS_FAIL.getStatus())
+                    || order.getOrderStatus().equals(TradeOrderStatusEnum.EXPIRED.getStatus())) {
                 return returnSendVouchersFailed();
             }
             JSONObject ticketRule = body.getJSONObject("ticket_rule");
@@ -1860,12 +1860,12 @@ public class TiktokCalendarServiceImpl implements TiktokCalendarService, OtaServ
             // 订单信息
             TradeOrderDO order = tradeOrderRepositoryService.getOrderByOtaAndExternalOrderNo(orderId, distributor.getId().toString());
             // 订单不存在或订单无效时 同意退款
-            if (order == null || order.getOrderStatus() == TradeOrderStatusEnum.CANCELED.getStatus()
-                    || order.getOrderStatus() == TradeOrderStatusEnum.FAIL.getStatus()) {
+            if (order == null || order.getOrderStatus().equals(TradeOrderStatusEnum.CANCELED.getStatus())
+                    || order.getOrderStatus().equals(TradeOrderStatusEnum.FAIL.getStatus())) {
                 return returnCancelTiktokCalendar(0, "无效订单");
-            }else if (order.getOrderStatus() == TradeOrderStatusEnum.INIT.getStatus()
-                    || order.getOrderStatus() == TradeOrderStatusEnum.UNPAID.getStatus()
-                    || order.getOrderStatus() == TradeOrderStatusEnum.PAYING.getStatus()) {
+            }else if (order.getOrderStatus().equals(TradeOrderStatusEnum.INIT.getStatus())
+                    || order.getOrderStatus().equals(TradeOrderStatusEnum.UNPAID.getStatus())
+                    || order.getOrderStatus().equals(TradeOrderStatusEnum.PAYING.getStatus())) {
                 CommonResult<?> commonResult = tradeOrderPayService.cancelOrder(order.getId());
                 if (commonResult.isSuccess()) {
                     return returnCancelTiktokCalendar(0, "退款成功");

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/ota/impl/XieChengServiceImpl.java

@@ -815,7 +815,7 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
                     CommonResult<TradeRefundRespDTO> refundResult = tradeRefundService.refund(refundCreateReqDTO);
                     if (refundResult.isSuccess()) {
                         res_body.put("supplierConfirmType", 1);
-                    } else if (refundResult.getCode() == REFUND_AUDITING.getCode()) {
+                    } else if (refundResult.getCode().equals(REFUND_AUDITING.getCode())) {
                         // 1.取消已确认 2.取消待确认（当confirmType =2时需异步返回确认结果的）
                         res_body.put("supplierConfirmType", 2);
                     }else {
@@ -990,15 +990,15 @@ public class XieChengServiceImpl implements XieChengService, OtaService {
                     voucher.put("voucherId", tradeDetailDO.getVoucherCode());
 
                     // 0、待使用；1、已使用；2、已取消
-                    if (tradeDetailDO.getVoucherStatus() == VoucherStatusEnum.UNUSED.getStatus() || tradeDetailDO.getVoucherStatus() == VoucherStatusEnum.TOOK.getStatus()) {
+                    if (tradeDetailDO.getVoucherStatus().equals(VoucherStatusEnum.UNUSED.getStatus()) || tradeDetailDO.getVoucherStatus().equals(VoucherStatusEnum.TOOK.getStatus())) {
                         passenger.put("passengerStatus", 0);
                         voucher.put("voucherStatus", 0);
-                    } else if (tradeDetailDO.getVoucherStatus() == VoucherStatusEnum.VERIFIED.getStatus() || tradeDetailDO.getVoucherStatus() == VoucherStatusEnum.OVERDUE_VERIFIED.getStatus()) {
+                    } else if (tradeDetailDO.getVoucherStatus().equals(VoucherStatusEnum.VERIFIED.getStatus()) || tradeDetailDO.getVoucherStatus().equals(VoucherStatusEnum.OVERDUE_VERIFIED.getStatus())) {
                         passenger.put("passengerStatus", 1);
                         voucher.put("voucherStatus", 1);
-                    } else if (tradeDetailDO.getVoucherStatus() == VoucherStatusEnum.REFUNDING.getStatus()
+                    } else if (tradeDetailDO.getVoucherStatus().equals(VoucherStatusEnum.REFUNDING.getStatus())
                             || ObjectUtil.equals(tradeDetailDO.getVoucherStatus(),VoucherStatusEnum.PART_REFUND.getStatus())
-                            || tradeDetailDO.getVoucherStatus() == VoucherStatusEnum.REFUND.getStatus()) {
+                            || tradeDetailDO.getVoucherStatus().equals(VoucherStatusEnum.REFUND.getStatus())) {
                         passenger.put("passengerStatus", 2);
                         voucher.put("voucherStatus", 2);
                     }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/utils/HexUtil.java

@@ -165,8 +165,9 @@ public class HexUtil {
     }
 
     public static byte[] parseHexStr2Byte(String hexStr) {
-        if (hexStr.length() < 1)
+        if (hexStr.length() < 1) {
             return null;
+        }
         byte[] result = new byte[hexStr.length() / 2];
         for (int i = 0; i < hexStr.length() / 2; i++) {
             int high = Integer.parseInt(hexStr.substring(i * 2, i * 2 + 1), 16);