分类修改

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

@@ -44,6 +44,7 @@ public class MerchantClassificationService {
                 .name(classification.getName())
                 .goodsIds(classification.getGoodsIds())
                 .sort(classification.getSort())
+                .enabled(true)
                 .type(4)
                 .build();
 

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

@@ -157,7 +157,7 @@ public class MerchantSettingsService {
     }
 
     /*
-    人均消费 进一个月
+    人均消费 月订单
      */
     public BigDecimal consumption(Merchant merchant) {
         List<OrderInfo> orders = orderInfoRepo.findAllByMerchantId(merchant.getId());

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

@@ -21,6 +21,7 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.Null;
 import java.io.IOException;
 import java.util.Comparator;
 import java.util.List;
@@ -42,13 +43,16 @@ public class MerchantClassificationController extends BaseController {
             MerchantClassification orig = merchantClassificationRepo.findById(record.getId()).orElseThrow(new BusinessException("无记录"));
             ObjUtils.merge(orig, record);
             MerchantClassification byName = merchantClassificationRepo.findByMerchantIdAndName(orig.getMerchantId(), orig.getName());
-            if (!byName.getId().equals(orig.getId())){
-                throw new BusinessException("该分类已存在");
+            if (ObjectUtil.isNotNull(byName)) {
+                if (!byName.getId().equals(orig.getId())) {
+                    throw new BusinessException("该分类已存在");
+                }
             }
             return merchantClassificationRepo.save(orig);
         }
+        MerchantClassification add = merchantClassificationService.add(SecurityUtils.getAuthenticatedUser().getId(), record);
         //添加
-        return merchantClassificationService.add(SecurityUtils.getAuthenticatedUser().getId(), record);
+        return add;
         //return merchantClassificationRepo.save(record);
     }
 
@@ -67,7 +71,7 @@ public class MerchantClassificationController extends BaseController {
     @PostMapping("/del/{id}")
     public void del(@PathVariable Long id) {
         MerchantClassification classification = merchantClassificationRepo.findById(id).orElseThrow(new BusinessException("无分类"));
-        if (StrUtil.isNotBlank(classification.getGoodsIds())){
+        if (StrUtil.isNotBlank(classification.getGoodsIds())) {
             throw new BusinessException("该分类下有商品，暂无法删除");
         }
         merchantClassificationRepo.deleteById(id);

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

@@ -1,6 +1,7 @@
 package com.izouma.dingdong.contorller;
 
 import com.izouma.dingdong.domain.merchant.MerchantClassification;
+import com.izouma.dingdong.service.merchant.MerchantClassificationService;
 import com.izouma.dingdong.web.merchant.MerchantClassificationController;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -14,6 +15,8 @@ public class ClassificationControllerTest {
 
     @Autowired
     private MerchantClassificationController controller;
+    @Autowired
+    private MerchantClassificationService service;
 
     @Test
     public void testDel(){
@@ -29,14 +32,17 @@ public class ClassificationControllerTest {
     public void testSave(){
         MerchantClassification classification = new MerchantClassification();
 
-        classification.setId(205L);
-        classification.setName("点单必读");
+        //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));
+        classification.setEnabled(true);
+        System.out.println(service.add(188L,classification));
+
+
     }
 
     @Test