中医药小程序代码提交

src/main/java/com/tcm/common/service/impl/AreaServiceImpl.java

@@ -213,15 +213,17 @@ public class AreaServiceImpl implements AreaService {
         if (StringHelper.isEmpty(req.getAreaId())) {
             FloorAreaVo areaVo = new FloorAreaVo();
             String areaId = StringHelper.getNewID();
-            areaVo.setFloorId(areaId);
+            areaVo.setAreaId(areaId);
+            areaVo.setFloorId(req.getFloorId());
             ObjectHelper.writeWithFrom(areaVo, req);
             areaVo.setCreateTime(DateHelper.getNow());
+            areaVo.setIsFeature(0);
             floorAreaDao.create(areaVo);
 
             FloorAreaExtendVo areaExtendVo = new FloorAreaExtendVo();
             areaExtendVo.setAreaId(areaId);
             areaExtendVo.setAreaExtendId(StringHelper.getNewID());
-            ObjectHelper.writeWithFrom(areaExtendVo, req.getFloorAreaExtendVo());
+            ObjectHelper.writeWithFrom(areaExtendVo, req.getAreaExtendVo());
             floorAreaExtendDao.create(areaExtendVo);
 
             ImageReqVo imageReqVo = new ImageReqVo();
@@ -239,15 +241,15 @@ public class AreaServiceImpl implements AreaService {
 
             FloorAreaExtendVo areaExtendVo = new FloorAreaExtendVo();
             areaExtendVo.setAreaId(req.getAreaId());
-            areaExtendVo.setLanguageType(req.getFloorAreaExtendVo().getLanguageType());
+            areaExtendVo.setLanguageType(req.getAreaExtendVo().getLanguageType());
             FloorAreaExtendVo loadExtend = floorAreaExtendDao.load(areaExtendVo, FloorAreaExtendVo.class);
             if (loadExtend == null) {
                 //新增
                 areaExtendVo.setAreaExtendId(StringHelper.getNewID());
-                ObjectHelper.writeWithFrom(areaExtendVo, req.getFloorAreaExtendVo());
+                ObjectHelper.writeWithFrom(areaExtendVo, req.getAreaExtendVo());
                 floorAreaExtendDao.create(areaExtendVo);
             } else {
-                ObjectHelper.writeWithFrom(loadExtend, req.getFloorAreaExtendVo());
+                ObjectHelper.writeWithFrom(loadExtend, req.getAreaExtendVo());
                 floorAreaExtendDao.update(loadExtend);
             }
             ImageReqVo imageReqVo = new ImageReqVo();

src/main/java/com/tcm/common/service/impl/ImageServiceImpl.java

@@ -87,15 +87,18 @@ public class ImageServiceImpl implements ImageService {
     @Override
     public String saveList(ImageReqVo imageReqVo) {
         List<ImageVo> imageList = new ArrayList<>();
-        for (ImageVo imageVo : imageReqVo.getImageList()) {
-            ImageVo image = new ImageVo();
-            ObjectHelper.writeWithFrom(image, imageReqVo);
-            image.setImageId(StringHelper.getNewID());
-            image.setCreateTime(DateHelper.getNow());
-            image.setImageUrl(imageVo.getImageUrl());
-            imageList.add(image);
+        if (!StringHelper.isEmpty(imageReqVo.getImageList())
+                && imageReqVo.getImageList().size() > 0) {
+            for (ImageVo imageVo : imageReqVo.getImageList()) {
+                ImageVo image = new ImageVo();
+                ObjectHelper.writeWithFrom(image, imageReqVo);
+                image.setImageId(StringHelper.getNewID());
+                image.setCreateTime(DateHelper.getNow());
+                image.setImageUrl(imageVo.getImageUrl());
+                imageList.add(image);
+            }
+            imageDao.createList(imageList);
         }
-        imageDao.createList(imageReqVo.getImageList());
         return imageReqVo.getRelationId();
     }
 }

src/main/java/com/tcm/product/dao/impl/ProductCategoryDaoImpl.java

@@ -22,6 +22,7 @@ public class ProductCategoryDaoImpl extends BaseDaoImpl implements ProductCatego
                 " left join tcm_image as ti on p.category_id = ti.relation_id  where 1=1 {WHERE} order by p.sort")
                 .add("categoryId", "and p.category_id = ?")
                 .add("languageType", "and pe.language_type =?")
+                .add("categoryType", "and p.category_type = ?")
 
         ;
     }

src/main/java/com/tcm/util/area/req/FloorAreaReqVo.java

@@ -10,7 +10,7 @@ public class FloorAreaReqVo extends FloorAreaVo {
 
     private Integer languageType;
 
-    private FloorAreaExtendVo floorAreaExtendVo;
+    private FloorAreaExtendVo areaExtendVo;
 
     private List<ImageVo> imageVoList;
 
@@ -22,12 +22,12 @@ public class FloorAreaReqVo extends FloorAreaVo {
         this.imageVoList = imageVoList;
     }
 
-    public FloorAreaExtendVo getFloorAreaExtendVo() {
-        return floorAreaExtendVo;
+    public FloorAreaExtendVo getAreaExtendVo() {
+        return areaExtendVo;
     }
 
-    public void setFloorAreaExtendVo(FloorAreaExtendVo floorAreaExtendVo) {
-        this.floorAreaExtendVo = floorAreaExtendVo;
+    public void setAreaExtendVo(FloorAreaExtendVo areaExtendVo) {
+        this.areaExtendVo = areaExtendVo;
     }
 
     public Integer getLanguageType() {

src/main/java/com/tcm/util/product/req/ProductCategoryLoadPageReqVo.java

@@ -9,6 +9,8 @@ public class ProductCategoryLoadPageReqVo extends PageSizeReqVo {
 
     private String categoryId;
 
+    private Integer categoryType;
+
     private String categoryName;
 
     private Integer languageType;
@@ -52,4 +54,12 @@ public class ProductCategoryLoadPageReqVo extends PageSizeReqVo {
     public void setLanguageType(Integer languageType) {
         this.languageType = languageType;
     }
+
+    public Integer getCategoryType() {
+        return categoryType;
+    }
+
+    public void setCategoryType(Integer categoryType) {
+        this.categoryType = categoryType;
+    }
 }