修改商家后台管理

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/CouponPagingParam.java

@@ -2,7 +2,7 @@ package com.chelvc.cloud.vehicle.api.param;
 
 import com.chelvc.cloud.vehicle.api.constant.CouponStatus;
 import com.chelvc.cloud.vehicle.api.constant.CouponType;
-import com.chelvc.framework.base.model.Paging;
+import com.chelvc.framework.common.model.Paging;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/param/GoodsModifyParam.java

@@ -1,7 +1,7 @@
 package com.chelvc.cloud.vehicle.api.param;
 import com.chelvc.cloud.vehicle.api.constant.CategoryType;
 import com.chelvc.cloud.vehicle.api.constant.GoodsStatus;
-import com.chelvc.framework.base.model.File;
+import com.chelvc.framework.common.model.File;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/CouponService.java

@@ -2,9 +2,7 @@ package com.chelvc.cloud.vehicle.api.service;
 import com.chelvc.cloud.vehicle.api.dto.CouponDTO;
 import com.chelvc.cloud.vehicle.api.param.CouponModifyParam;
 import com.chelvc.cloud.vehicle.api.param.CouponPagingParam;
-import com.chelvc.framework.base.model.Pagination;
-import java.util.Collection;
-import java.util.List;
+import com.chelvc.framework.common.model.Pagination;
 
 /**
  * 优惠券业务操作接口

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/service/GoodsService.java

@@ -3,7 +3,7 @@ import java.util.List;
 import com.chelvc.cloud.vehicle.api.dto.GoodsDTO;
 import com.chelvc.cloud.vehicle.api.dto.GoodsDetailDTO;
 import com.chelvc.cloud.vehicle.api.param.*;
-import com.chelvc.framework.base.model.Pagination;
+import com.chelvc.framework.common.model.Pagination;
 
 /**
  * 商品业务接口

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/CouponServiceImpl.java

@@ -12,8 +12,9 @@ import com.chelvc.cloud.vehicle.server.copier.CouponCopier;
 import com.chelvc.cloud.vehicle.server.dao.CouponMapper;
 import com.chelvc.cloud.vehicle.server.entity.Coupon;
 import com.chelvc.cloud.vehicle.server.service.CouponService;
-import com.chelvc.framework.base.model.Pagination;
-import com.chelvc.framework.base.util.StringUtils;
+import com.chelvc.framework.base.util.ResourceUtils;
+import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.database.context.DatabaseContextHolder;
 import com.chelvc.framework.database.util.PagingUtils;
 import lombok.NonNull;
@@ -44,14 +45,14 @@ public class CouponServiceImpl extends ServiceImpl<CouponMapper, Coupon> impleme
 
     @Override
     public void updateCoupon(@NonNull Long id, @NonNull CouponModifyParam param) {
-        Coupon coupon = DatabaseContextHolder.getRequireEntity(this, id, "商品优惠卷不存在");
+        Coupon coupon = ResourceUtils.required(this.getById(id), "商品优惠卷不存在");
         CouponCopier.INSTANCE.copying(param, coupon);
         this.updateById(coupon);
     }
 
     @Override
     public void deleteCoupon(@NonNull Long id) {
-        DatabaseContextHolder.getRequireEntity(this, id, "商品优惠卷不存在");
+        ResourceUtils.required(this.getById(id), "商品优惠卷不存在");
         this.baseMapper.deleteById(id);
     }
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/GoodsServiceImpl.java

@@ -19,8 +19,8 @@ import com.chelvc.cloud.vehicle.server.service.CouponService;
 import com.chelvc.cloud.vehicle.server.service.GoodsService;
 import com.chelvc.framework.base.context.SessionContextHolder;
 import com.chelvc.framework.base.util.ResourceUtils;
-import com.chelvc.framework.base.model.Pagination;
-import com.chelvc.framework.base.util.StringUtils;
+import com.chelvc.framework.common.model.Pagination;
+import com.chelvc.framework.common.util.StringUtils;
 import com.chelvc.framework.database.context.DatabaseContextHolder;
 import com.chelvc.framework.database.util.PagingUtils;
 import lombok.NonNull;
@@ -87,14 +87,14 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
     @Override
     public void updateGoods(@NonNull Long id, @NonNull GoodsModifyParam param) {
-        Goods goods = DatabaseContextHolder.getRequireEntity(this, id, "商品不存在");
+        Goods goods = ResourceUtils.required(this.getById(id), "商品不存在");
         GoodsCopier.INSTANCE.copying(param, goods);
         this.updateById(goods);
     }
 
     @Override
     public void deleteGoods(@NonNull Long id) {
-        DatabaseContextHolder.getRequireEntity(this, id, "商品不存在");
+        ResourceUtils.required(this.getById(id), "商品不存在");
         this.baseMapper.deleteById(id);
     }
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/service/impl/MerchantServiceImpl.java

@@ -92,6 +92,12 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
         this.updateById(merchant);
     }
 
+    @Override
+    public void deleteMerchant(@NonNull Long id) {
+         ResourceUtils.required(this.getById(id), "商家不存在");
+        this.baseMapper.deleteById(id);
+    }
+
     @Override
     public Pagination<MerchantDTO> getMerchantPaging(@NonNull MerchantPagingParam param) {
         Page<Merchant> page = this.lambdaQuery()