Merge remote-tracking branch 'origin/v4.9_create_goods_child_20230918' into test

performance-web/src/main/java/com/clx/performance/component/OrderGoodsIdGenerate.java

@@ -29,7 +29,7 @@ public class OrderGoodsIdGenerate {
             Long maxOrderGoodsId = null;
             String maxID = orderGoodsDao.getMaxOrderGoodsId(type);
             if (StringUtils.isNotBlank(maxID)) {
-                maxOrderGoodsId = Long.valueOf(maxID);
+                maxOrderGoodsId = Long.valueOf(maxID.substring(2));
             }
 
             if (maxOrderGoodsId == null) {

performance-web/src/main/java/com/clx/performance/service/impl/OrderGoodsServiceImpl.java

@@ -31,6 +31,7 @@ import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -105,7 +106,7 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
             Long driverUserNo = orderGoodsListParam.getDriverUserNo();
             Result<List<String>> ownTruckByUserNo = userClxFeign.getOwnTruckByUserNo(driverUserNo);
             log.info("通过用户编号:{} 查询本人车辆，查询结果:{}",driverUserNo,ownTruckByUserNo);
-            if (ownTruckByUserNo.getCode().equals(ResultCodeEnum.SUCCESS)) {
+            if (Objects.equals(ownTruckByUserNo.getCode(),ResultCodeEnum.SUCCESS.getCode())) {
                 if (CollectionUtils.isEmpty(truckList) &&  ownTruckByUserNo.getData().isEmpty()) {
                     throw new ServiceSystemException(PerformanceResultEnum.DATA_NOT_FIND, "当前用户未绑定车辆");
                 }