商家分类

src/main/java/com/izouma/dingdong/service/merchant/MerchantClassificationService.java

@@ -68,7 +68,7 @@ public class MerchantClassificationService {
 
         List<Goods> goods = CollUtil.newArrayList();
         goodsIds.forEach(s -> {
-            goods.add(goodsRepo.findById(s).orElseThrow(new BusinessException("商品不存在")));
+            goods.add(goodsRepo.findById(s).orElse(null));
         });
         return goods;
     }

src/main/java/com/izouma/dingdong/web/merchant/MerchantClassificationController.java

@@ -41,7 +41,8 @@ public class MerchantClassificationController extends BaseController {
         if (record.getId() != null) {
             MerchantClassification orig = merchantClassificationRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
             ObjUtils.merge(orig, record);
-            if (ObjectUtil.isNotNull(merchantClassificationRepo.findByMerchantIdAndName(orig.getMerchantId(), orig.getName()))){
+            MerchantClassification byName = merchantClassificationRepo.findByMerchantIdAndName(orig.getMerchantId(), orig.getName());
+            if (!byName.getId().equals(orig.getId())){
                 throw new BusinessException("该分类已存在");
             }
             return merchantClassificationRepo.save(orig);

src/test/java/com/izouma/dingdong/contorller/ClassificationControllerTest.java

@@ -1,5 +1,6 @@
 package com.izouma.dingdong.contorller;
 
+import com.izouma.dingdong.domain.merchant.MerchantClassification;
 import com.izouma.dingdong.web.merchant.MerchantClassificationController;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -23,4 +24,23 @@ public class ClassificationControllerTest {
     public void testDelGoods(){
         controller.delGoods(1L,109L);
     }
+
+    @Test
+    public void testSave(){
+        MerchantClassification classification = new MerchantClassification();
+
+        classification.setId(205L);
+        classification.setName("点单必读");
+        classification.setSort(1);
+        classification.setMerchantId(189L);
+        classification.setGoodsIds("310,311");
+        classification.setIsOpen(false);
+        classification.setIsShow(true);
+        System.out.println(controller.save(classification));
+    }
+
+    @Test
+    public void show(){
+        System.out.println(controller.allGoods(475L));
+    }
 }