Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!567

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/GoodsCategoryMgrController.java

@@ -191,6 +191,7 @@ public class GoodsCategoryMgrController extends BaseApiController {
   @Log(title = "删除商品分类", businessType = BusinessType.DELETE)
   @PostMapping(value = "/remove")
   @PreAuthorize("@ss.hasPermi('business:category:remove')")
+  @ApiOperation("删除商品分类")
   public AjaxResult remove(@RequestBody GoodsCategory goodsCategory) {
 
     if (null == goodsCategory.getCategoryId() || 0 == goodsCategory.getCategoryId()) {
@@ -202,6 +203,12 @@ public class GoodsCategoryMgrController extends BaseApiController {
       return error(ErrorCodeEnum.ERROR_CODE_1024);
     }
 
+    int count = goodsCategoryService.count(new LambdaQueryWrapper<GoodsCategory>()
+            .eq(GoodsCategory::getParentId, goodsCategory.getCategoryId()));
+    if (count > 0) {
+      return error("删除失败，分类下存在子分类");
+    }
+
     boolean res = goodsCategoryService.removeById(goodsCategory.getCategoryId());
     return res ? AjaxResult.success("删除成功") : AjaxResult.error("删除失败");
   }

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/GoodsMgrController.java

@@ -222,7 +222,6 @@ public class GoodsMgrController extends BaseApiController {
         return AjaxResult.error("商品" + goods.getTitle() + "不满足多SKU条件！");
       } else {
         GoodsSku firstGoodsSku = skuList.get(0);
-        goods.setOriginPrice(firstGoodsSku.getOriginPrice());
         goods.setExchangePrice(firstGoodsSku.getExchangePrice());
         goods.setValue(firstGoodsSku.getValue());
         goods.setCost(firstGoodsSku.getCost());
@@ -233,7 +232,7 @@ public class GoodsMgrController extends BaseApiController {
       }
     }
     if (null == goods.getOriginPrice()) {
-      goods.setOriginPrice(goodsParam.getExchangePrice());
+      goods.setOriginPrice(0);
     }
     if (null == goods.getDiscountRate()) {
       goods.setDiscountRate(goodsParam.getDiscountRate());
@@ -291,9 +290,7 @@ public class GoodsMgrController extends BaseApiController {
         goods.setValue(firstGoodsSku.getValue());
         goods.setCost(firstGoodsSku.getCost());
         if (null == firstGoodsSku.getOriginPrice()) {
-          goods.setOriginPrice(goodsParam.getExchangePrice());
-        } else {
-          goods.setOriginPrice(firstGoodsSku.getOriginPrice());
+          goods.setOriginPrice(0);
         }
         if (null == firstGoodsSku.getDiscountRate()) {
           goods.setDiscountRate(goodsParam.getDiscountRate());