上传关联2.0

src/main/java/com/glxp/api/service/collect/RelCodeDetailService.java

@@ -27,7 +27,6 @@ public class RelCodeDetailService extends ServiceImpl<RelCodeDetailMapper, RelCo
      * @return
      */
     public RelCodeDetailResponse scanCode(RelCodeDetailRequest relCodeDetailRequest) {
-        //todo 查询子集
         String parentCode = relCodeDetailRequest.getParentCode();
         if(StrUtil.isBlank(parentCode)){
             throw new JsonException("父级码不能为空");
@@ -36,14 +35,24 @@ public class RelCodeDetailService extends ServiceImpl<RelCodeDetailMapper, RelCo
         LambdaQueryWrapper<BasicProductsEntity> qw = new LambdaQueryWrapper<BasicProductsEntity>()
                 .eq(BasicProductsEntity::getNameCode, relCodeDetailRequest.getParentCode())
                 .last("limit 1");
-        BasicProductsEntity basicProductsEntity = basicProductsDao.selectOne(qw);
+        BasicProductsEntity parent = basicProductsDao.selectOne(qw);
-        if(basicProductsEntity == null){
+        if(parent == null){
-            throw new JsonException("");
+            throw new JsonException("产品信息不存在");
         }
-        relCodeDetailResponse.setCurCode(basicProductsEntity.getNameCode());
+        Integer packLevel = Integer.valueOf(parent.getPackLevel());
-        relCodeDetailResponse.setPackLayer(Integer.valueOf(basicProductsEntity.getPackLevel()));
+        if(packLevel == 1){
-        relCodeDetailResponse.setParentCode(parentCode);
+            throw new JsonException("产品信息不存在子包装");
-        relCodeDetailResponse.setFlag(Integer.valueOf(basicProductsEntity.getMajorStatus()));
+        }
+        //todo 可能存在多个子集 如何处理
+        LambdaQueryWrapper<BasicProductsEntity> qw2 = new LambdaQueryWrapper<BasicProductsEntity>()
+                .eq(BasicProductsEntity::getUuid, parent.getUuid())
+                .eq(BasicProductsEntity::getPackLevel,packLevel - 1)
+                .last("limit 1");
+        BasicProductsEntity subset = basicProductsDao.selectOne(qw2);
+        relCodeDetailResponse.setCurCode(subset.getNameCode());
+        relCodeDetailResponse.setPackLayer(Integer.valueOf(subset.getPackLevel()));
+        relCodeDetailResponse.setParentCode(parent.getNameCode());
+        relCodeDetailResponse.setFlag(Integer.valueOf(subset.getMajorStatus()));
         return relCodeDetailResponse;
     }