用户统计与商家入驻统计优化

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

@@ -143,7 +143,7 @@ public class MerchantDTO implements Serializable {
     /**
      * 商家主营业务名称
      */
-    private String mainBusinessName;
+//    private String mainBusinessName;
     /**
      * 商家副营业务
      */
@@ -152,6 +152,6 @@ public class MerchantDTO implements Serializable {
     /**
      * 商家副营业务名称
      */
-    private List<String> ancillaryBusinessName;
+//    private List<String> ancillaryBusinessName;
 
 }

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

@@ -30,6 +30,10 @@ public class ReportModifyParam implements Serializable {
      * 查哪一月得
      */
     private Integer month;
+    /**
+     * 日期
+     */
+    private Integer day;
     /**
      * 商家ID
      */

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

@@ -162,6 +162,13 @@ public interface MerchantService {
      */
     List<Map<String,Object>> getMerchantReport(ReportModifyParam param);
 
+
+    /**
+     * 获取商家入驻统计
+     * @return
+     */
+    Map<String,Object> getMerchantReportCount(ReportModifyParam param);
+
 }
 
 

vehicle-server/src/main/java/com/chelvc/cloud/vehicle/server/dao/MerchantMapper.java

@@ -143,4 +143,15 @@ public interface MerchantMapper extends BaseMapper<Merchant> {
      * @return
      */
     List<Map<String,Object>> getAddMerchantReportByMonth(@Param("year") Integer year,@Param("month")Integer month);
+
+
+
+    /**
+     * 获取用户注册统计
+     * @param year 查询年期
+     * @param month 查询月份
+     * @return
+     */
+    Map<String,Object> getAddMerchantReport(@Param("year") Integer year,
+                                             @Param("month") Integer month,@Param("day") Integer day);
 }

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

@@ -204,7 +204,7 @@ public class CategoryServiceImpl extends ServiceImpl<CategoryMapper, Category> i
     public List<CategoryDTO> listCategories(List<Long> ids){
         List<Category> categories = this.lambdaQuery().in(Category::getId,ids).eq(Category::getEnabled, true)
                 .orderByAsc(Category::getSort).list();
-        categories.sort(Comparator.comparing(Category::getType).thenComparing(Category::getSort));
+//        categories.sort(Comparator.comparing(Category::getType).thenComparing(Category::getSort));
         return CategoryCopier.INSTANCE.copying(categories);
     }
 

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

@@ -110,15 +110,17 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
         MerchantDTO merchant = MerchantCopier.INSTANCE.copying(
                 AssertUtils.available(this.baseMapper.getMerchantById(id, param), "商家不存在")
         );
-        Category category = this.categoryService.getById(merchant.getMainBusiness());
-        if (null != category){
-            merchant.setMainBusinessName(category.getName());
-        }
-        List<Category> categoryList = this.categoryService.getCategories(merchant.getAncillaryBusiness());
-        List<String> ancillaryBusinessNames = categoryList.stream()
-                .map(Category::getName) //
-                .collect(Collectors.toList());
-        merchant.setAncillaryBusinessName(ancillaryBusinessNames);
+//        Category category = this.categoryService.getById(merchant.getMainBusiness());
+//        if (null != category){
+//            merchant.setMainBusinessName(category.getName());
+//        }
+//        List<Category> categoryList = this.categoryService.getCategories(merchant.getAncillaryBusiness());
+//        if (!CollectionUtils.isEmpty(categoryList)){
+//            List<String> ancillaryBusinessNames = categoryList.stream()
+//                    .map(Category::getName) //
+//                    .collect(Collectors.toList());
+//            merchant.setAncillaryBusinessName(ancillaryBusinessNames);
+//        }
         Long userId = SessionContextHolder.getSession().getId();
         //查询商家是否被收藏
         Integer count = this.baseMapper.merchantFavorite(id, userId);
@@ -131,9 +133,9 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
                 id, GoodsQueryParam.builder().size(100).build()
         );
         // 获取商家商品分类类型列表
-        List<Long> idSet = new ArrayList<>();
-        idSet.add(merchant.getMainBusiness());
-        idSet.addAll(merchant.getAncillaryBusiness());
+        List<Long> idSet = goods.stream()
+                .map(GoodsDTO::getCategoryId) // 将每个Person对象映射到其id
+                .collect(Collectors.toList());
         if (idSet.isEmpty()) {
             return MerchantDetailDTO.builder().merchant(merchant).goods(goods).build();
         }
@@ -485,4 +487,18 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantMapper, Merchant> i
         }
     }
 
+
+    @Override
+    public Map<String,Object> getMerchantReportCount(ReportModifyParam param){
+        Integer month = param.getMonth();
+        Integer day = param.getDay();
+        if ("0".equals(param.getType())){
+            month = null;
+            day = null;
+        }else if ("1".equals(param.getType())){
+            day = null;
+        }
+        return this.baseMapper.getAddMerchantReport(param.getYear(),month,day);
+    }
+
 }

vehicle-server/src/main/resources/mapper/CategoryMapper.xml

@@ -9,7 +9,7 @@
 
     <select id="listRecommendCategories" resultType="com.chelvc.cloud.vehicle.server.entity.Category">
         <include refid="BASIC_CATEGORY_SELECT"/>
-        where cy.enabled = 1 and cy.recommend = 1
+        where cy.enabled = 1 and cy.recommend = 1 and type = 0
         order by cy.sort asc limit #{size}
     </select>
 

vehicle-server/src/main/resources/mapper/MerchantMapper.xml

@@ -340,4 +340,31 @@
 
 
 
+    <select id="getAddMerchantReport" resultType="java.util.Map">
+        SELECT
+        count( 1) registerCount
+        FROM
+        merchant
+        WHERE
+        YEAR ( create_time ) = #{year}
+        <if test="month != null">
+            AND MONTH ( create_time ) = #{month}
+        </if>
+        <if test="day != null">
+            AND DAY ( create_time ) = #{day}
+        </if>
+        GROUP BY
+        YEAR ( create_time )
+        <if test="month != null">
+            ,MONTH ( create_time )
+        </if>
+        <if test="day != null">
+            ,DAY ( create_time )
+        </if>
+
+    </select>
+
+
+
+
 </mapper>