oying-system/src/main/java/com/oying/modules/pc/category/converter/PlatformCategoryViewAssembler.java

@@ -3,14 +3,14 @@
import cn.hutool.core.bean.BeanUtil;
import com.oying.modules.pc.category.domain.PlatformCategory;
import com.oying.modules.pc.category.view.PlatformCategoryCustomerView;
import com.oying.modules.pc.category.view.PlatformCategoryView;
import com.oying.modules.pc.category.view.PlatformCategoryAdminView;
import org.springframework.stereotype.Component;

@Component
public class PlatformCategoryViewAssembler {

    public PlatformCategoryView toPlatformCategoryResponse(PlatformCategory category) {
        PlatformCategoryView categoryView = new PlatformCategoryView();
    public PlatformCategoryAdminView toPlatformCategoryResponse(PlatformCategory category) {
        PlatformCategoryAdminView categoryView = new PlatformCategoryAdminView();
        BeanUtil.copyProperties(category, categoryView);
        categoryView.setIconUrl("");
        return categoryView;

 oying-system/src/main/java/com/oying/modules/pc/category/domain/PlatformCategory.java

@@ -1,25 +1,27 @@
package com.oying.modules.pc.category.domain;

import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
import java.sql.Timestamp;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.oying.base.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;

/**
* @description /
* @author lzp
* @date 2025-04-28
**/
@Data
@Getter
@Setter
@TableName("pc_platform_category")
public class PlatformCategory implements Serializable {
public class PlatformCategory extends BaseEntity implements Serializable {

    @TableId(value = "category_id", type = IdType.AUTO)
    @ApiModelProperty(value = "类目ID")
@@ -44,6 +46,9 @@
    @ApiModelProperty(value = "类目图标ID")
    private Long iconId;

    @ApiModelProperty(value = "类目图标Url")
    private String iconUrl;

    @NotNull
    @ApiModelProperty(value = "状态")
    private Integer status;
@@ -51,20 +56,6 @@
    @NotNull
    @ApiModelProperty(value = "是否启用(0-否 1-是)")
    private Integer active;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @NotNull
    @ApiModelProperty(value = "创建时间")
    private Timestamp createTime;

    @ApiModelProperty(value = "修改人")
    private Long updateBy;

    @NotNull
    @ApiModelProperty(value = "更新时间")
    private Timestamp updateTime;

    public void copy(PlatformCategory source){
        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));

 oying-system/src/main/java/com/oying/modules/pc/category/domain/dto/PlatformCategoryQueryCriteria.java

@@ -1,17 +1,32 @@
package com.oying.modules.pc.category.domain.dto;

import lombok.Data;
import com.oying.utils.DateUtil;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;

import java.time.LocalDateTime;

/**
* @author lzp
* @date 2025-04-30
**/
 * @author lzp
 * @date 2025-04-30
 **/
@Data
public class PlatformCategoryQueryCriteria{
public class PlatformCategoryQueryCriteria {

    @ApiModelProperty(value = "模糊查询")
    private String blurry;

    @ApiModelProperty(value = "是否启用", example = "1")
    private Integer active = 1;
    private Integer active;

    @ApiModelProperty(value = "开始时间", example = "2025-06-03 00:00:00")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createStart;

    @ApiModelProperty(value = "结束时间", example = "2025-06-03 23:59:59")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private LocalDateTime createEnd;

    @ApiModelProperty(value = "页码", example = "1")
    private Integer page = 1;
@@ -19,4 +34,8 @@
    @ApiModelProperty(value = "每页数据量", example = "10")
    private Integer size = 10;

    public static void main(String[] args) {
        System.out.println(DateUtil.getTimeStamp(DateUtil.parseLocalDateTimeFormat("2025-04-30 18:21:22", "yyyy-MM-dd HH:mm:ss")));
    }

}

 oying-system/src/main/java/com/oying/modules/pc/category/rest/PlatformCategoryAdminController.java

@@ -9,7 +9,7 @@
import com.oying.modules.pc.category.domain.dto.PlatformCategoryUpdateDto;
import com.oying.modules.pc.category.domain.dto.PlatformCategoryUpdateRequest;
import com.oying.modules.pc.category.service.PlatformCategoryService;
import com.oying.modules.pc.category.view.PlatformCategoryView;
import com.oying.modules.pc.category.view.PlatformCategoryAdminView;
import com.oying.utils.R;
import com.oying.utils.PageResult;
import io.swagger.annotations.Api;
@@ -41,14 +41,14 @@
    private final PlatformCategoryService categoryService;
    private final PlatformCategoryViewAssembler assembler;

    @GetMapping
    @GetMapping(value = "/list")
    @ApiOperation("查询平台类目(支持分页)")
    @PreAuthorize("@el.check('admin:platformCategory:list')")
    //@PreAuthorize("@el.check('admin:platformCategory:list')")
    public ResponseEntity<?> queryPlatformCategory(PlatformCategoryQueryCriteria criteria) {
        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());
        PageResult<PlatformCategory> pageResult = categoryService.queryAll(criteria, page);
        List<PlatformCategoryView> responseList = Optional.ofNullable(pageResult.getContent()).orElse(new ArrayList<>()).stream().map(assembler::toPlatformCategoryResponse).collect(Collectors.toList());
        PageResult<PlatformCategoryView> responsePageResult = new PageResult<>(responseList, pageResult.getTotalElements());
        List<PlatformCategoryAdminView> responseList = Optional.ofNullable(pageResult.getContent()).orElse(new ArrayList<>()).stream().map(assembler::toPlatformCategoryResponse).collect(Collectors.toList());
        PageResult<PlatformCategoryAdminView> responsePageResult = new PageResult<>(responseList, pageResult.getTotalElements());
        return ResponseEntity.ok(R.success(responsePageResult));
    }

@@ -60,7 +60,7 @@
        return ResponseEntity.status(HttpStatus.CREATED).build();
    }

    @PutMapping("/{categoryId}")
    @PutMapping(value = "/{categoryId}")
    @ApiOperation("修改平台类目")
    //@PreAuthorize("@el.check('admin:platformCategory:updateById')")
    public ResponseEntity<?> updateById(@PathVariable Long categoryId,

 oying-system/src/main/java/com/oying/modules/pc/category/service/impl/PlatformCategoryServiceImpl.java

@@ -53,7 +53,6 @@
        platformCategoryCreate.setSortWeight(request.getSortWeight());
        platformCategoryCreate.setIconId(request.getIconUploadFileId());
        platformCategoryCreate.setActive(request.getActive());
        platformCategoryCreate.setCreateBy(SecurityUtils.getCurrentUserId());

        // 使用处理图标文件
        platformCategoryMapper.insert(platformCategoryCreate);
@@ -76,7 +75,6 @@
        platformCategoryUpdate.setIconId(updateDto.getIconUploadFileId());
        platformCategoryUpdate.setActive(updateDto.getActive());
        existingPlatformCategory.copy(platformCategoryUpdate);
        existingPlatformCategory.setUpdateBy(SecurityUtils.getCurrentUserId());
        platformCategoryMapper.updateById(existingPlatformCategory);

        // 使用处理图标文件

 oying-system/src/main/java/com/oying/modules/pc/category/view/PlatformCategoryAdminView.java

New file
@@ -0,0 +1,29 @@
package com.oying.modules.pc.category.view;

import lombok.Data;

import java.io.Serializable;
import java.time.LocalDateTime;

@Data
public class PlatformCategoryAdminView implements Serializable {

    private Long categoryId;

    private String name;

    private Integer sortWeight;

    private String iconUrl;

    private Integer active;

    private String createBy;

    private LocalDateTime createTime;

    private String updateBy;

    private LocalDateTime updateTime;

}

 oying-system/src/main/java/com/oying/modules/pc/category/view/PlatformCategoryView.java

File was deleted

 oying-system/src/main/java/com/oying/modules/pc/product/domain/Product.java

@@ -1,25 +1,27 @@
package com.oying.modules.pc.product.domain;

import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
import java.sql.Timestamp;
import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.oying.base.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.math.BigDecimal;

/**
* @description /
* @author lzp
* @date 2025-04-30
**/
@Data
@Getter
@Setter
@TableName("pc_product")
public class Product implements Serializable {
public class Product extends BaseEntity implements Serializable {

    @TableId(value = "product_id")
    @ApiModelProperty(value = "ID")
@@ -93,22 +95,6 @@
    @NotNull
    @ApiModelProperty(value = "是否删除")
    private Integer deletedFlag;

    @NotNull
    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @NotNull
    @ApiModelProperty(value = "创建时间")
    private Timestamp createTime;

    @NotNull
    @ApiModelProperty(value = "修改人")
    private Long updateBy;

    @NotNull
    @ApiModelProperty(value = "修改时间")
    private Timestamp updateTime;

    @NotNull
    @ApiModelProperty(value = "版本号")

 oying-system/src/main/java/com/oying/modules/pc/product/domain/ProductCategory.java

File was deleted

 oying-system/src/main/java/com/oying/modules/pc/product/mapper/ProductCategoryMapper.java

File was deleted

 oying-system/src/main/java/com/oying/modules/pc/product/service/ProductCategoryService.java

File was deleted

 oying-system/src/main/java/com/oying/modules/pc/product/service/impl/ProductCategoryServiceImpl.java

File was deleted

 oying-system/src/main/java/com/oying/modules/pc/product/service/impl/ProductServiceImpl.java

@@ -46,7 +46,6 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public void create(Product resources) {
        resources.setCreateBy(SecurityUtils.getCurrentUserId());
        productMapper.insert(resources);
    }

@@ -55,7 +54,6 @@
    public void update(Product resources) {
        Product product = getById(resources.getProductId());
        product.copy(resources);
        product.setUpdateBy(SecurityUtils.getCurrentUserId());
        productMapper.updateById(product);
    }


 oying-system/src/main/java/com/oying/modules/pc/store/domain/Store.java

@@ -5,8 +5,11 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.oying.base.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.geo.Point;

import javax.validation.constraints.NotBlank;
@@ -14,15 +17,15 @@
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalTime;
import java.time.ZonedDateTime;

/**
 * @author lzp
 * @date 2025-04-21
 **/
@Data
@Getter
@Setter
@TableName("pc_store")
public class Store implements Serializable {
public class Store extends BaseEntity implements Serializable {

    @TableId(value = "store_id", type = IdType.AUTO)
    @ApiModelProperty(value = "唯一标识")
@@ -54,13 +57,17 @@
    @ApiModelProperty(value = "状态：1000-草稿  1002-正常  1003-暂停营业 1004-关闭")
    private Integer status;

    @NotBlank
    @ApiModelProperty(value = "店铺logo图片")
    private Long logoImageId;

    @NotBlank
    @ApiModelProperty(value = "店铺logo图片Url")
    private Long logoImageUrl;

    @ApiModelProperty(value = "店铺封面图")
    private Long coverImageId;

    @ApiModelProperty(value = "店铺封面图Url")
    private Long coverImageUrl;

    @ApiModelProperty(value = "店铺描述")
    private String description;
@@ -112,22 +119,6 @@

    @ApiModelProperty(value = "营业半径(米)")
    private Integer radius;

    @NotNull
    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @NotNull
    @ApiModelProperty(value = "创建日期")
    private ZonedDateTime createTime;

    @NotNull
    @ApiModelProperty(value = "修改人")
    private Long updateBy;

    @NotNull
    @ApiModelProperty(value = "修改时间")
    private ZonedDateTime updateTime;

    public void copy(Store source) {
        BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));

 oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreCategory.java

@@ -1,24 +1,27 @@
package com.oying.modules.pc.store.domain;

import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
import java.sql.Timestamp;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.oying.base.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

/**
* @description /
* @author lzp
* @date 2025-04-27
**/
@Data
@Getter
@Setter
@TableName("pc_store_category")
public class StoreCategory implements Serializable {
public class StoreCategory extends BaseEntity implements Serializable {

    @TableId(value = "category_id")
    @ApiModelProperty(value = "ID")
@@ -51,18 +54,6 @@

    @ApiModelProperty(value = "是否启用(0-否 1-是)")
    private Integer active;

    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @ApiModelProperty(value = "创建时间")
    private Timestamp createTime;

    @ApiModelProperty(value = "更新人")
    private Long updateBy;

    @ApiModelProperty(value = "更新时间")
    private Timestamp updateTime;

    public void copy(StoreCategory source){
        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));

 oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreLocation.java

File was deleted

 oying-system/src/main/java/com/oying/modules/pc/store/domain/StoreQualification.java

@@ -1,27 +1,27 @@
package com.oying.modules.pc.store.domain;

import lombok.Data;
import cn.hutool.core.bean.BeanUtil;
import io.swagger.annotations.ApiModelProperty;
import cn.hutool.core.bean.copier.CopyOptions;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.oying.base.BaseEntity;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;

import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.time.LocalTime;
import java.time.ZonedDateTime;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;

/**
* @description /
* @author lzp
* @date 2025-04-22
**/
@Data
@Getter
@Setter
@TableName("pc_store_qualification")
public class StoreQualification implements Serializable {
public class StoreQualification extends BaseEntity implements Serializable {

    @TableId(value = "qualification_id", type = IdType.AUTO)
    @ApiModelProperty(value = "资质ID")
@@ -44,6 +44,9 @@
    @ApiModelProperty(value = "资质图片")
    private String qualificationImageId;

    @ApiModelProperty(value = "资质图片")
    private String qualificationImageUrl;

    @ApiModelProperty(value = "有效期开始日期")
    private LocalTime startDate;

@@ -52,22 +55,6 @@

    @ApiModelProperty(value = "状态：1000-草稿 1001-有效 1002-无效")
    private Integer status;

    @NotNull
    @ApiModelProperty(value = "创建人")
    private Long createBy;

    @NotNull
    @ApiModelProperty(value = "创建日期")
    private ZonedDateTime createTime;

    @NotNull
    @ApiModelProperty(value = "修改人")
    private Long updateBy;

    @NotNull
    @ApiModelProperty(value = "修改时间")
    private ZonedDateTime updateTime;

    public void copy(StoreQualification source){
        BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));

 oying-system/src/main/java/com/oying/modules/pc/store/rest/StoreController.java

@@ -25,12 +25,12 @@
    private final StoreService storeService;

    @GetMapping(value = "/page")
    public R<?> getStoresByPage(@RequestBody StoreQueryCriteria criteria) {
    public R<?> getStoresByPage(StoreQueryCriteria criteria) {
        return R.success(storeService.queryByPage(criteria));
    }

    @GetMapping(value = "/list")
    public R<?> getStores(@RequestBody StoreQueryCriteria criteria) {
    public R<?> getStores(StoreQueryCriteria criteria) {
        return R.success(storeService.queryAll(criteria));
    }

@@ -49,8 +49,6 @@
        Store store = new Store();
        store.setStoreId(StoreIdGenerator.getId());
        store.setMerchantId(SecurityUtils.getCurrentUserId());
        store.setCreateBy(SecurityUtils.getCurrentUserId());
        store.setCreateTime(ZonedDateTime.now());
        storeService.save(store);
        return R.success();
    }

 oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreCategoryServiceImpl.java

@@ -47,7 +47,6 @@
    public void create(StoreCategory resources) {
        // 重名
        this.calculateAndSetLevel(resources);
        resources.setCreateBy(SecurityUtils.getCurrentUserId());
        storeCategoryMapper.insert(resources);
    }

@@ -56,7 +55,6 @@
    public void update(StoreCategory resources) {
        StoreCategory storeCategory = getById(resources.getCategoryId());
        storeCategory.copy(resources);
        resources.setUpdateBy(SecurityUtils.getCurrentUserId());
        storeCategoryMapper.updateById(storeCategory);
    }


 oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreQualificationServiceImpl.java

@@ -1,23 +1,21 @@
package com.oying.modules.pc.store.service.impl;

import cn.hutool.core.util.ObjUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.oying.exception.EntityExistException;
import com.oying.modules.pc.common.id.StoreQualificationIdGenerator;
import com.oying.modules.pc.store.domain.StoreQualification;
import com.oying.modules.pc.store.domain.dto.StoreQualificationQueryCriteria;
import com.oying.modules.pc.store.mapper.StoreQualificationMapper;
import com.oying.modules.pc.store.service.StoreQualificationService;
import com.oying.utils.*;
import com.oying.utils.PageResult;
import com.oying.utils.PageUtil;
import lombok.RequiredArgsConstructor;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.ZonedDateTime;
import java.util.*;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Optional;

/**
* @description 服务实现
@@ -44,17 +42,11 @@
    @Transactional(rollbackFor = Exception.class)
    public void create(StoreQualification resources) {
        // resources.setQualificationId(StoreQualificationIdGenerator.getId());
        resources.setCreateBy(SecurityUtils.getCurrentUserId());
        resources.setCreateTime(ZonedDateTime.now());
        storeQualificationMapper.insert(resources);
    }

    @Override
    public void batchCreate(List<StoreQualification> resources) {
        resources.forEach(i-> {
            i.setCreateBy(SecurityUtils.getCurrentUserId());
            i.setCreateTime(ZonedDateTime.now());
        });
        this.saveBatch(resources);
    }


 oying-system/src/main/java/com/oying/modules/pc/store/service/impl/StoreServiceImpl.java

@@ -52,8 +52,6 @@
    @Override
    public boolean create(Store store) {
        // store.setStoreId(StoreIdGenerator.getId());
        store.setCreateBy(SecurityUtils.getCurrentUserId());
        store.setCreateTime(ZonedDateTime.now());
        return save(store);
    }


 oying-system/src/main/resources/mapper/pc/category/PlatformCategoryMapper.xml

@@ -8,6 +8,7 @@
        <result column="level" property="level"/>
        <result column="sort_weight" property="sortWeight"/>
        <result column="icon_id" property="iconId"/>
        <result column="icon_url" property="iconId"/>
        <result column="status" property="status"/>
        <result column="active" property="active"/>
        <result column="create_by" property="createBy"/>
@@ -25,9 +26,18 @@
        <include refid="Base_Column_List"/>
        from pc_platform_category
        <where>
            <if test="criteria.blurry != null and criteria.blurry != ''">
                and name like concat('%',#{criteria.blurry},'%')
            </if>
            <if test="criteria.active != null">
                and active = #{criteria.active}
            </if>
            <if test="criteria.createStart != null">
                and create_time &gt;= #{criteria.createStart}
            </if>
            <if test="criteria.createEnd != null">
                and create_time &lt;= #{criteria.createEnd}
            </if>
        </where>
        order by category_id desc
    </select>