后台管理商家角色权限优化

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/dto/GoodsDTO.java

@@ -33,6 +33,11 @@ public class GoodsDTO implements Serializable {
      */
     private CategoryType type;
 
+    /**
+     * 分类名称
+     */
+    private String  categoryName;
+
     /**
      * 分类ID
      */

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/dto/OmsCartItemDTO.java

@@ -84,5 +84,9 @@ public class OmsCartItemDTO implements Serializable
      * 商家ID
      */
     private Long merchantId;
+    /**
+     * 商品原价
+     */
+    private Double originalPrice;
 
 }

vehicle-api/src/main/java/com/chelvc/cloud/vehicle/api/dto/ReservationDTO.java

@@ -29,6 +29,10 @@ public class ReservationDTO implements Serializable {
      * 用户ID
      */
     private Long userId;
+    /**
+     * 用户名称
+     */
+    private String username;
 
     /**
      * 商家ID

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

@@ -98,4 +98,10 @@ public interface MerchantService {
      * @return 商家信息
      */
     MerchantDTO getMerchant(Long id);
+
+    /**
+     * 获取商家信息
+     * @return
+     */
+    List<MerchantDTO> getMerchantIdsByUserId();
 }

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

@@ -12,7 +12,9 @@ import com.chelvc.cloud.vehicle.api.param.GoodsPagingParam;
 import com.chelvc.cloud.vehicle.api.param.GoodsQueryParam;
 import com.chelvc.cloud.vehicle.server.copier.GoodsCopier;
 import com.chelvc.cloud.vehicle.server.dao.GoodsMapper;
+import com.chelvc.cloud.vehicle.server.entity.Category;
 import com.chelvc.cloud.vehicle.server.entity.Goods;
+import com.chelvc.cloud.vehicle.server.service.CategoryService;
 import com.chelvc.cloud.vehicle.server.service.CommentService;
 import com.chelvc.cloud.vehicle.server.service.CouponService;
 import com.chelvc.cloud.vehicle.server.service.GoodsService;
@@ -43,6 +45,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         com.chelvc.cloud.vehicle.api.service.GoodsService {
     private final CouponService couponService;
     private final CommentService commentService;
+    private final CategoryService categoryService;
 
     @Override
     public List<CategoryType> listMerchantGoodsCategoryTypes(@NonNull Long merchantId) {
@@ -114,7 +117,14 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
                 .eq(Objects.nonNull(param.getStatus()), Goods::getStatus, param.getStatus())
                 .like(StringUtils.nonEmpty(param.getName()), Goods::getName, param.getName())
                 .orderByDesc(Goods::getCreateTime).page(PagingUtils.convert(param.getPaging()));
-        return PagingUtils.convert(page, GoodsCopier.INSTANCE::copying);
+        Pagination<GoodsDTO> pagination = PagingUtils.convert(page, GoodsCopier.INSTANCE::copying);
+        pagination.getRecords().forEach(item ->{
+            Category category = this.categoryService.getById(item.getCategoryId());
+            if (category != null){
+                item.setCategoryName(category.getName());
+            }
+        });
+        return pagination;
     }
 
     @Override

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

@@ -187,4 +187,13 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
                .list();
        return merchants.stream().map(Merchant::getId).collect(Collectors.toList());
     }
+    @Override
+    public List<MerchantDTO> getMerchantIdsByUserId(){
+        Long userId = SessionContextHolder.getSession().getId();
+        List<Merchant> merchants = this.lambdaQuery()
+                .eq(Merchant::getUserId, userId)
+                .eq(Merchant::getStatus, MerchantStatus.ONLINE)
+                .list();
+        return MerchantCopier.INSTANCE.copying(merchants);
+    }
 }

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

@@ -365,6 +365,7 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
     }
     @Override
     public Pagination<OmsOrderDTO> getOrderPaging(OrderPagingParam param){
+        Long userId = SessionContextHolder.getId();
         Page<OmsOrder> page = this.lambdaQuery()
                 .eq(OmsOrder :: getStatus,param.getStatus())
                 .orderByDesc(OmsOrder :: getCreateTime)