修复bug

module-common/src/main/java/org/jeecg/api/bean/PageBean.java

@@ -17,6 +17,6 @@ public class PageBean {
 
     public PageBean() {
         this.pageNo = 1;
-        this.pageSize = 1000;
+        this.pageSize = Integer.MAX_VALUE;
     }
 }

module-common/src/main/java/org/jeecg/api/controller/AppletClassController.java

@@ -65,5 +65,13 @@ public class AppletClassController {
         return appletClassService.getGoodsBrandList(name,productId,pageBean);
     }
 
+    //根据商品标识查询商品品牌下的款式
+    @ApiOperation(value="根据商品标识查询商品品牌下的款式", notes="根据商品标识查询商品品牌下的款式")
+    @GetMapping(value = "/getGoodsBrandProduct")
+    public Result<?> getGoodsBrandProduct(String productId, String brandId){
+        return appletClassService.getGoodsBrandProduct(productId, brandId);
+    }
+
+
 
 }

module-common/src/main/java/org/jeecg/api/service/AppletClassService.java

@@ -28,6 +28,5 @@ public interface AppletClassService {
     Result<?> getGoodsBrandList(String name,String productId,PageBean pageBean);
 
 
-
-
+    Result<?> getGoodsBrandProduct(String productId, String brandId);
 }

module-common/src/main/java/org/jeecg/api/service/impl/AppletClassServiceImpl.java

@@ -8,6 +8,8 @@ import org.jeecg.api.service.AppletClassService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.commonAddress.service.ICommonAddressService;
+import org.jeecg.modules.commonBrandProduct.entity.CommonBrandProduct;
+import org.jeecg.modules.commonBrandProduct.service.ICommonBrandProductService;
 import org.jeecg.modules.commonShop.entity.CommonShop;
 import org.jeecg.modules.commonShop.service.ICommonShopService;
 import org.jeecg.modules.commonShopClass.entity.CommonShopClass;
@@ -33,6 +35,8 @@ public class AppletClassServiceImpl implements AppletClassService {
     private ICommonShopClassService commonShopClassService;
     @Resource
     private ICommonVipService commonVipService;
+    @Resource
+    private ICommonBrandProductService commonBrandProductService;
 
     //获取价格预览分类列表
     @Override
@@ -83,7 +87,7 @@ public class AppletClassServiceImpl implements AppletClassService {
 
         String[] vids = byId.getShopCion() == null ? null : byId.getShopCion().split(",");
 
-        Page<CommonVip> page = new Page<>(pageBean.getPageNo(),pageBean.getPageSize());
+        Page<CommonVip> page = new Page<>(1, Integer.MAX_VALUE);
         IPage<CommonVip> pageList = commonVipService
                 .lambdaQuery()
                 .in(vids != null, CommonVip::getId, vids)
@@ -93,8 +97,13 @@ public class AppletClassServiceImpl implements AppletClassService {
         return Result.OK("商品品牌",pageList);
     }
 
-
-
+    @Override
+    public Result<?> getGoodsBrandProduct(String productId, String brandId) {
+        return Result.ok(commonBrandProductService.lambdaQuery()
+//                .eq(CommonBrandProduct::getBrandId, brandId)
+//                .eq(CommonBrandProduct::getShopId, productId)
+                .list());
+    }
 
 
 }

module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java

@@ -28,6 +28,8 @@ import org.jeecg.modules.commonVip.entity.CommonVip;
 import org.jeecg.modules.commonVip.service.ICommonVipService;
 import org.jeecg.modules.common_reasons.entity.CommonReasons;
 import org.jeecg.modules.common_reasons.service.ICommonReasonsService;
+import org.jeecg.modules.commonBrandProduct.entity.CommonBrandProduct;
+import org.jeecg.modules.commonBrandProduct.service.ICommonBrandProductService;
 import org.jeecg.modules.commonCity.entity.CommonCity;
 import org.jeecg.modules.commonCity.service.ICommonCityService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
@@ -76,6 +78,8 @@ public class AppletOrderServiceImpl implements AppletOrderService {
     private IHanHaiMemberService hanHaiMemberService;
     @Autowired
     private ILogisticsTrajectoryService logisticsTrajectoryService;
+    @Autowired
+    private ICommonBrandProductService commonBrandProductService;
 
 
     @Resource
@@ -192,7 +196,17 @@ public class AppletOrderServiceImpl implements AppletOrderService {
             if (vip != null){
                 order1.setPinName(vip.getName());
             }else {
-                order1.setPinName("品牌已被删除");
+                order1.setPinName("品牌已被下架");
+            }
+
+            // 设置款式名称
+            if (StringUtils.isNotBlank(order1.getStyleId())) {
+                CommonBrandProduct brandProduct = commonBrandProductService.getById(order1.getStyleId());
+                if (brandProduct != null) {
+                    order1.setStyleName(brandProduct.getName());
+                } else {
+                    order1.setStyleName("款式已被下架");
+                }
             }
 
             //查询下级
@@ -291,15 +305,38 @@ public class AppletOrderServiceImpl implements AppletOrderService {
 
                 titles.add(commonShop.getName());
 
+                // 检查是否有款式ID，如果有则使用款式价格，否则使用商品价格
+                BigDecimal unitMinPrice = null;
+                BigDecimal unitMaxPrice = null;
+                
+                if (StringUtils.isNotBlank(sku.getStyleId())) {
+                    // 查询款式信息
+                    CommonBrandProduct brandProduct = commonBrandProductService.getById(sku.getStyleId());
+                    if (brandProduct != null) {
+                        unitMinPrice = brandProduct.getMinPrice();
+                        unitMaxPrice = brandProduct.getMaxPrice();
+                        log.info("使用款式价格计算，款式ID: {}, 最低价格: {}, 最高价格: {}", 
+                                sku.getStyleId(), unitMinPrice, unitMaxPrice);
+                    } else {
+                        log.warn("款式ID {} 不存在，使用商品价格", sku.getStyleId());
+                        unitMinPrice = commonShop.getPrice();
+                        unitMaxPrice = commonShop.getMaxPrice();
+                    }
+                } else {
+                    // 使用商品价格
+                    unitMinPrice = commonShop.getPrice();
+                    unitMaxPrice = commonShop.getMaxPrice();
+                }
+
                 // 计算最低价格
-                if (commonShop.getPrice() != null){
-                    minEstimatedPrice = commonShop.getPrice().multiply(new BigDecimal(sku.getNum()));
+                if (unitMinPrice != null){
+                    minEstimatedPrice = unitMinPrice.multiply(new BigDecimal(sku.getNum()));
                     minEstimatedPriceSum = minEstimatedPriceSum.add(minEstimatedPrice);
                 }
                 
                 // 计算最高价格
-                if (commonShop.getMaxPrice() != null){
-                    maxEstimatedPrice = commonShop.getMaxPrice().multiply(new BigDecimal(sku.getNum()));
+                if (unitMaxPrice != null){
+                    maxEstimatedPrice = unitMaxPrice.multiply(new BigDecimal(sku.getNum()));
                     maxEstimatedPriceSum = maxEstimatedPriceSum.add(maxEstimatedPrice);
                 } else {
                     // 如果没有最高价格，使用最低价格作为最高价格
@@ -314,9 +351,9 @@ public class AppletOrderServiceImpl implements AppletOrderService {
                     // 如果最低价格高于最高价格，将最高价格设置为最低价格
                     maxEstimatedPrice = minEstimatedPrice;
                     // 重新计算总价
-                    maxEstimatedPriceSum = maxEstimatedPriceSum.subtract(commonShop.getMaxPrice() != null ? 
-                            commonShop.getMaxPrice().multiply(new BigDecimal(sku.getNum())) : BigDecimal.ZERO)
-                            .add(maxEstimatedPrice);
+                maxEstimatedPriceSum = maxEstimatedPriceSum.subtract(unitMaxPrice != null ? 
+                        unitMaxPrice.multiply(new BigDecimal(sku.getNum())) : BigDecimal.ZERO)
+                        .add(maxEstimatedPrice);
                 }
 
 
@@ -333,7 +370,7 @@ public class AppletOrderServiceImpl implements AppletOrderService {
                 sku.setUnit(commonShop.getUnit());
                 sku.setEstimatedPrice(calculatePriceDisplay(minEstimatedPrice, maxEstimatedPrice));
 //                sku.setEstimatedPrice(minEstimatedPrice.stripTrailingZeros().toPlainString() + "-" + maxEstimatedPrice.stripTrailingZeros().toPlainString());
-                sku.setOnePrice(commonShop.getPrice());
+                sku.setOnePrice(unitMinPrice != null ? unitMinPrice : commonShop.getPrice());
 
                 commonOrderService.save(sku);
 
@@ -346,6 +383,7 @@ public class AppletOrderServiceImpl implements AppletOrderService {
                     order3.setShopId(commonShop.getId());
                     order3.setCreateTime(new Date());
                     order3.setPinId(sku.getPinId());
+                    order3.setStyleId(sku.getStyleId());
                     order3.setNum(1);
                     order3.setType(0);
                     commonOrderService.save(order3);

module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java

@@ -25,6 +25,8 @@ import org.jeecg.modules.commonText.service.ICommonTextService;
 import org.jeecg.modules.commonVip.entity.CommonVip;
 import org.jeecg.modules.commonVip.service.ICommonVipService;
 import org.jeecg.modules.common_reasons.service.ICommonReasonsService;
+import org.jeecg.modules.commonBrandProduct.entity.CommonBrandProduct;
+import org.jeecg.modules.commonBrandProduct.service.ICommonBrandProductService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,6 +62,8 @@ public class AppletOrderTeamServiceImpl implements AppletOrderTeamService {
     @Autowired
     private ICommonShopService commonShopService;
     @Autowired
+    private ICommonBrandProductService commonBrandProductService;
+    @Autowired
     private org.jeecg.api.service.impl.LogisticsUtil logisticsUtil;
     @Autowired
     private ICommonAdminOrderBrowseRecordService commonAdminOrderBrowseRecordService;
@@ -200,7 +204,17 @@ public class AppletOrderTeamServiceImpl implements AppletOrderTeamService {
             if (vip != null){
                 order1.setPinName(vip.getName());
             }else {
-                order1.setPinName("品牌已被删除");
+                order1.setPinName("品牌已被下架");
+            }
+
+            // 设置款式名称
+            if (StringUtils.isNotBlank(order1.getStyleId())) {
+                CommonBrandProduct brandProduct = commonBrandProductService.getById(order1.getStyleId());
+                if (brandProduct != null) {
+                    order1.setStyleName(brandProduct.getName());
+                } else {
+                    order1.setStyleName("款式已被下架");
+                }
             }
 
             //查询下级
@@ -514,6 +528,7 @@ public class AppletOrderTeamServiceImpl implements AppletOrderTeamService {
             return Result.error("订单列表为空");
         }
 
+
         BigDecimal priceSum = new BigDecimal(0);//总价格
         Integer qualifiedNumSum = 0;//合格数量
         Integer noQualifiedNumSum = 0;//不合格数量
@@ -570,7 +585,7 @@ public class AppletOrderTeamServiceImpl implements AppletOrderTeamService {
             }
 
 
-            commonOrderService.save(orderReq);
+//            commonOrderService.save(orderReq);
 
             if (orderReq.getCommonOrderList() == null) {
                 continue;
@@ -585,7 +600,7 @@ public class AppletOrderTeamServiceImpl implements AppletOrderTeamService {
                 orderReq2.setPinId(orderReq.getPinId());
                 orderReq2.setNum(1);
                 orderReq2.setType(1);
-                commonOrderService.save(orderReq2);
+//                commonOrderService.save(orderReq2);
             }
         }
 
@@ -598,12 +613,12 @@ public class AppletOrderTeamServiceImpl implements AppletOrderTeamService {
         order.setTestingTime(new Date());
         order.setIsUserId(member.getId());
 
-        commonOrderService.updateById(order);
+//        commonOrderService.updateById(order);
 
         // 添加最近回收
 //        addCommonGet(order, member);
 
-        amountSettlement(order);
+//        amountSettlement(order);
         return Result.OK("提交成功");
     }
 

module-common/src/main/java/org/jeecg/modules/commonBrandCategory/controller/CommonBrandCategoryController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.commonBrandCategory.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.commonBrandCategory.entity.CommonBrandCategory;
+import org.jeecg.modules.commonBrandCategory.service.ICommonBrandCategoryService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 品牌分类
+ * @Author: jeecg-boot
+ * @Date:   2025-08-25
+ * @Version: V1.0
+ */
+@Api(tags="品牌分类")
+@RestController
+@RequestMapping("/commonBrandCategory/commonBrandCategory")
+@Slf4j
+public class CommonBrandCategoryController extends JeecgController<CommonBrandCategory, ICommonBrandCategoryService> {
+	@Autowired
+	private ICommonBrandCategoryService commonBrandCategoryService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param commonBrandCategory
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "品牌分类-分页列表查询")
+	@ApiOperation(value="品牌分类-分页列表查询", notes="品牌分类-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CommonBrandCategory>> queryPageList(CommonBrandCategory commonBrandCategory,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CommonBrandCategory> queryWrapper = QueryGenerator.initQueryWrapper(commonBrandCategory, req.getParameterMap());
+		Page<CommonBrandCategory> page = new Page<CommonBrandCategory>(pageNo, pageSize);
+		IPage<CommonBrandCategory> pageList = commonBrandCategoryService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param commonBrandCategory
+	 * @return
+	 */
+	@AutoLog(value = "品牌分类-添加")
+	@ApiOperation(value="品牌分类-添加", notes="品牌分类-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CommonBrandCategory commonBrandCategory) {
+		commonBrandCategoryService.save(commonBrandCategory);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param commonBrandCategory
+	 * @return
+	 */
+	@AutoLog(value = "品牌分类-编辑")
+	@ApiOperation(value="品牌分类-编辑", notes="品牌分类-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CommonBrandCategory commonBrandCategory) {
+		commonBrandCategoryService.updateById(commonBrandCategory);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "品牌分类-通过id删除")
+	@ApiOperation(value="品牌分类-通过id删除", notes="品牌分类-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		commonBrandCategoryService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "品牌分类-批量删除")
+	@ApiOperation(value="品牌分类-批量删除", notes="品牌分类-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.commonBrandCategoryService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "品牌分类-通过id查询")
+	@ApiOperation(value="品牌分类-通过id查询", notes="品牌分类-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CommonBrandCategory> queryById(@RequestParam(name="id",required=true) String id) {
+		CommonBrandCategory commonBrandCategory = commonBrandCategoryService.getById(id);
+		if(commonBrandCategory==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(commonBrandCategory);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param commonBrandCategory
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CommonBrandCategory commonBrandCategory) {
+        return super.exportXls(request, commonBrandCategory, CommonBrandCategory.class, "品牌分类");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CommonBrandCategory.class);
+    }
+
+}

module-common/src/main/java/org/jeecg/modules/commonBrandCategory/entity/CommonBrandCategory.java

@@ -0,0 +1,57 @@
+package org.jeecg.modules.commonBrandCategory.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 品牌分类
+ * @Author: jeecg-boot
+ * @Date:   2025-08-25
+ * @Version: V1.0
+ */
+@Data
+@TableName("common_brand_category")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="common_brand_category对象", description="品牌分类")
+public class CommonBrandCategory implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**分类名称*/
+	@Excel(name = "分类名称", width = 15)
+    @ApiModelProperty(value = "分类名称")
+    private java.lang.String name;
+}

module-common/src/main/java/org/jeecg/modules/commonBrandCategory/mapper/CommonBrandCategoryMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.commonBrandCategory.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.commonBrandCategory.entity.CommonBrandCategory;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 品牌分类
+ * @Author: jeecg-boot
+ * @Date:   2025-08-25
+ * @Version: V1.0
+ */
+public interface CommonBrandCategoryMapper extends BaseMapper<CommonBrandCategory> {
+
+}

module-common/src/main/java/org/jeecg/modules/commonBrandCategory/mapper/xml/CommonBrandCategoryMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.commonBrandCategory.mapper.CommonBrandCategoryMapper">
+
+</mapper>

module-common/src/main/java/org/jeecg/modules/commonBrandCategory/service/ICommonBrandCategoryService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.commonBrandCategory.service;
+
+import org.jeecg.modules.commonBrandCategory.entity.CommonBrandCategory;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 品牌分类
+ * @Author: jeecg-boot
+ * @Date:   2025-08-25
+ * @Version: V1.0
+ */
+public interface ICommonBrandCategoryService extends IService<CommonBrandCategory> {
+
+}

module-common/src/main/java/org/jeecg/modules/commonBrandCategory/service/impl/CommonBrandCategoryServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.commonBrandCategory.service.impl;
+
+import org.jeecg.modules.commonBrandCategory.entity.CommonBrandCategory;
+import org.jeecg.modules.commonBrandCategory.mapper.CommonBrandCategoryMapper;
+import org.jeecg.modules.commonBrandCategory.service.ICommonBrandCategoryService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 品牌分类
+ * @Author: jeecg-boot
+ * @Date:   2025-08-25
+ * @Version: V1.0
+ */
+@Service
+public class CommonBrandCategoryServiceImpl extends ServiceImpl<CommonBrandCategoryMapper, CommonBrandCategory> implements ICommonBrandCategoryService {
+
+}

module-common/src/main/java/org/jeecg/modules/commonBrandCategory/vue/CommonBrandCategoryList.vue

@@ -0,0 +1,171 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('品牌分类')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <common-brand-category-modal ref="modalForm" @ok="modalFormOk"></common-brand-category-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CommonBrandCategoryModal from './modules/CommonBrandCategoryModal'
+
+  export default {
+    name: 'CommonBrandCategoryList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CommonBrandCategoryModal
+    },
+    data () {
+      return {
+        description: '品牌分类管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'分类名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/commonBrandCategory/commonBrandCategory/list",
+          delete: "/commonBrandCategory/commonBrandCategory/delete",
+          deleteBatch: "/commonBrandCategory/commonBrandCategory/deleteBatch",
+          exportXlsUrl: "/commonBrandCategory/commonBrandCategory/exportXls",
+          importExcelUrl: "commonBrandCategory/commonBrandCategory/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'name',text:'分类名称',dictCode:''})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

module-common/src/main/java/org/jeecg/modules/commonBrandCategory/vue/modules/CommonBrandCategoryForm.vue

@@ -0,0 +1,104 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="分类名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入分类名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CommonBrandCategoryForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/commonBrandCategory/commonBrandCategory/add",
+          edit: "/commonBrandCategory/commonBrandCategory/edit",
+          queryById: "/commonBrandCategory/commonBrandCategory/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

module-common/src/main/java/org/jeecg/modules/commonBrandCategory/vue/modules/CommonBrandCategoryModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <common-brand-category-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></common-brand-category-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CommonBrandCategoryForm from './CommonBrandCategoryForm'
+
+  export default {
+    name: 'CommonBrandCategoryModal',
+    components: {
+      CommonBrandCategoryForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

module-common/src/main/java/org/jeecg/modules/commonBrandCategory/vue/modules/CommonBrandCategoryModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <common-brand-category-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></common-brand-category-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CommonBrandCategoryForm from './CommonBrandCategoryForm'
+  export default {
+    name: 'CommonBrandCategoryModal',
+    components: {
+      CommonBrandCategoryForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

module-common/src/main/java/org/jeecg/modules/commonBrandCategory/vue3/CommonBrandCategory.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/commonBrandCategory/commonBrandCategory/list',
+  save='/commonBrandCategory/commonBrandCategory/add',
+  edit='/commonBrandCategory/commonBrandCategory/edit',
+  deleteOne = '/commonBrandCategory/commonBrandCategory/delete',
+  deleteBatch = '/commonBrandCategory/commonBrandCategory/deleteBatch',
+  importExcel = '/commonBrandCategory/commonBrandCategory/importExcel',
+  exportXls = '/commonBrandCategory/commonBrandCategory/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

module-common/src/main/java/org/jeecg/modules/commonBrandCategory/vue3/CommonBrandCategory.data.ts

@@ -0,0 +1,23 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '分类名称',
+    align:"center",
+    dataIndex: 'name'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '分类名称',
+    field: 'name',
+    component: 'Input',
+  },
+];

module-common/src/main/java/org/jeecg/modules/commonBrandCategory/vue3/CommonBrandCategoryList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <CommonBrandCategoryModal @register="registerModal" @success="handleSuccess"></CommonBrandCategoryModal>
+  </div>
+</template>
+
+<script lang="ts" name="commonBrandCategory-commonBrandCategory" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import CommonBrandCategoryModal from './components/CommonBrandCategoryModal.vue'
+  import {columns, searchFormSchema} from './commonBrandCategory.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './commonBrandCategory.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '品牌分类',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"品牌分类",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

module-common/src/main/java/org/jeecg/modules/commonBrandCategory/vue3/components/CommonBrandCategoryModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../commonBrandCategory.data';
+    import {saveOrUpdate} from '../commonBrandCategory.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

module-common/src/main/java/org/jeecg/modules/commonBrandProduct/controller/CommonBrandProductController.java

@@ -0,0 +1,171 @@
+package org.jeecg.modules.commonBrandProduct.controller;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.commonBrandProduct.entity.CommonBrandProduct;
+import org.jeecg.modules.commonBrandProduct.service.ICommonBrandProductService;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+
+import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecgframework.poi.excel.def.NormalExcelConstants;
+import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
+import org.jeecg.common.system.base.controller.JeecgController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+import com.alibaba.fastjson.JSON;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.jeecg.common.aspect.annotation.AutoLog;
+
+ /**
+ * @Description: 品牌款式
+ * @Author: jeecg-boot
+ * @Date:   2025-08-25
+ * @Version: V1.0
+ */
+@Api(tags="品牌款式")
+@RestController
+@RequestMapping("/commonBrandProduct/commonBrandProduct")
+@Slf4j
+public class CommonBrandProductController extends JeecgController<CommonBrandProduct, ICommonBrandProductService> {
+	@Autowired
+	private ICommonBrandProductService commonBrandProductService;
+	
+	/**
+	 * 分页列表查询
+	 *
+	 * @param commonBrandProduct
+	 * @param pageNo
+	 * @param pageSize
+	 * @param req
+	 * @return
+	 */
+	//@AutoLog(value = "品牌款式-分页列表查询")
+	@ApiOperation(value="品牌款式-分页列表查询", notes="品牌款式-分页列表查询")
+	@GetMapping(value = "/list")
+	public Result<IPage<CommonBrandProduct>> queryPageList(CommonBrandProduct commonBrandProduct,
+								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+								   HttpServletRequest req) {
+		QueryWrapper<CommonBrandProduct> queryWrapper = QueryGenerator.initQueryWrapper(commonBrandProduct, req.getParameterMap());
+		Page<CommonBrandProduct> page = new Page<CommonBrandProduct>(pageNo, pageSize);
+		IPage<CommonBrandProduct> pageList = commonBrandProductService.page(page, queryWrapper);
+		return Result.OK(pageList);
+	}
+	
+	/**
+	 *   添加
+	 *
+	 * @param commonBrandProduct
+	 * @return
+	 */
+	@AutoLog(value = "品牌款式-添加")
+	@ApiOperation(value="品牌款式-添加", notes="品牌款式-添加")
+	@PostMapping(value = "/add")
+	public Result<String> add(@RequestBody CommonBrandProduct commonBrandProduct) {
+		commonBrandProductService.save(commonBrandProduct);
+		return Result.OK("添加成功！");
+	}
+	
+	/**
+	 *  编辑
+	 *
+	 * @param commonBrandProduct
+	 * @return
+	 */
+	@AutoLog(value = "品牌款式-编辑")
+	@ApiOperation(value="品牌款式-编辑", notes="品牌款式-编辑")
+	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
+	public Result<String> edit(@RequestBody CommonBrandProduct commonBrandProduct) {
+		commonBrandProductService.updateById(commonBrandProduct);
+		return Result.OK("编辑成功!");
+	}
+	
+	/**
+	 *   通过id删除
+	 *
+	 * @param id
+	 * @return
+	 */
+	@AutoLog(value = "品牌款式-通过id删除")
+	@ApiOperation(value="品牌款式-通过id删除", notes="品牌款式-通过id删除")
+	@DeleteMapping(value = "/delete")
+	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
+		commonBrandProductService.removeById(id);
+		return Result.OK("删除成功!");
+	}
+	
+	/**
+	 *  批量删除
+	 *
+	 * @param ids
+	 * @return
+	 */
+	@AutoLog(value = "品牌款式-批量删除")
+	@ApiOperation(value="品牌款式-批量删除", notes="品牌款式-批量删除")
+	@DeleteMapping(value = "/deleteBatch")
+	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
+		this.commonBrandProductService.removeByIds(Arrays.asList(ids.split(",")));
+		return Result.OK("批量删除成功!");
+	}
+	
+	/**
+	 * 通过id查询
+	 *
+	 * @param id
+	 * @return
+	 */
+	//@AutoLog(value = "品牌款式-通过id查询")
+	@ApiOperation(value="品牌款式-通过id查询", notes="品牌款式-通过id查询")
+	@GetMapping(value = "/queryById")
+	public Result<CommonBrandProduct> queryById(@RequestParam(name="id",required=true) String id) {
+		CommonBrandProduct commonBrandProduct = commonBrandProductService.getById(id);
+		if(commonBrandProduct==null) {
+			return Result.error("未找到对应数据");
+		}
+		return Result.OK(commonBrandProduct);
+	}
+
+    /**
+    * 导出excel
+    *
+    * @param request
+    * @param commonBrandProduct
+    */
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(HttpServletRequest request, CommonBrandProduct commonBrandProduct) {
+        return super.exportXls(request, commonBrandProduct, CommonBrandProduct.class, "品牌款式");
+    }
+
+    /**
+      * 通过excel导入数据
+    *
+    * @param request
+    * @param response
+    * @return
+    */
+    @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+    public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+        return super.importExcel(request, response, CommonBrandProduct.class);
+    }
+
+}

module-common/src/main/java/org/jeecg/modules/commonBrandProduct/entity/CommonBrandProduct.java

@@ -0,0 +1,79 @@
+package org.jeecg.modules.commonBrandProduct.entity;
+
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.Date;
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecg.common.aspect.annotation.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Description: 品牌款式
+ * @Author: jeecg-boot
+ * @Date:   2025-08-25
+ * @Version: V1.0
+ */
+@Data
+@TableName("common_brand_product")
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = false)
+@ApiModel(value="common_brand_product对象", description="品牌款式")
+public class CommonBrandProduct implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+	/**主键*/
+	@TableId(type = IdType.ASSIGN_ID)
+    @ApiModelProperty(value = "主键")
+    private java.lang.String id;
+	/**创建人*/
+    @ApiModelProperty(value = "创建人")
+    private java.lang.String createBy;
+	/**创建日期*/
+    @ApiModelProperty(value = "创建日期")
+    private java.util.Date createTime;
+	/**更新人*/
+    @ApiModelProperty(value = "更新人")
+    private java.lang.String updateBy;
+	/**更新日期*/
+    @ApiModelProperty(value = "更新日期")
+    private java.util.Date updateTime;
+	/**所属部门*/
+    @ApiModelProperty(value = "所属部门")
+    private java.lang.String sysOrgCode;
+	/**款式名称*/
+	@Excel(name = "款式名称", width = 15)
+    @ApiModelProperty(value = "款式名称")
+    private java.lang.String name;
+	/**款式图片*/
+	@Excel(name = "款式图片", width = 15)
+    @ApiModelProperty(value = "款式图片")
+    private java.lang.String image;
+	/**最低价格*/
+	@Excel(name = "最低价格", width = 15)
+    @ApiModelProperty(value = "最低价格")
+    private java.math.BigDecimal minPrice;
+	/**最高价格*/
+	@Excel(name = "最高价格", width = 15)
+    @ApiModelProperty(value = "最高价格")
+    private java.math.BigDecimal maxPrice;
+	/**品牌*/
+	@Excel(name = "品牌", width = 15, dictTable = "common_vip", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "common_vip", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "品牌")
+    private java.lang.String brandId;
+	/**商品*/
+	@Excel(name = "商品", width = 15, dictTable = "common_shop", dicText = "name", dicCode = "id")
+	@Dict(dictTable = "common_shop", dicText = "name", dicCode = "id")
+    @ApiModelProperty(value = "商品")
+    private java.lang.String shopId;
+}

module-common/src/main/java/org/jeecg/modules/commonBrandProduct/mapper/CommonBrandProductMapper.java

@@ -0,0 +1,17 @@
+package org.jeecg.modules.commonBrandProduct.mapper;
+
+import java.util.List;
+
+import org.apache.ibatis.annotations.Param;
+import org.jeecg.modules.commonBrandProduct.entity.CommonBrandProduct;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @Description: 品牌款式
+ * @Author: jeecg-boot
+ * @Date:   2025-08-25
+ * @Version: V1.0
+ */
+public interface CommonBrandProductMapper extends BaseMapper<CommonBrandProduct> {
+
+}

module-common/src/main/java/org/jeecg/modules/commonBrandProduct/mapper/xml/CommonBrandProductMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.jeecg.modules.commonBrandProduct.mapper.CommonBrandProductMapper">
+
+</mapper>

module-common/src/main/java/org/jeecg/modules/commonBrandProduct/service/ICommonBrandProductService.java

@@ -0,0 +1,14 @@
+package org.jeecg.modules.commonBrandProduct.service;
+
+import org.jeecg.modules.commonBrandProduct.entity.CommonBrandProduct;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * @Description: 品牌款式
+ * @Author: jeecg-boot
+ * @Date:   2025-08-25
+ * @Version: V1.0
+ */
+public interface ICommonBrandProductService extends IService<CommonBrandProduct> {
+
+}

module-common/src/main/java/org/jeecg/modules/commonBrandProduct/service/impl/CommonBrandProductServiceImpl.java

@@ -0,0 +1,19 @@
+package org.jeecg.modules.commonBrandProduct.service.impl;
+
+import org.jeecg.modules.commonBrandProduct.entity.CommonBrandProduct;
+import org.jeecg.modules.commonBrandProduct.mapper.CommonBrandProductMapper;
+import org.jeecg.modules.commonBrandProduct.service.ICommonBrandProductService;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+/**
+ * @Description: 品牌款式
+ * @Author: jeecg-boot
+ * @Date:   2025-08-25
+ * @Version: V1.0
+ */
+@Service
+public class CommonBrandProductServiceImpl extends ServiceImpl<CommonBrandProductMapper, CommonBrandProduct> implements ICommonBrandProductService {
+
+}

module-common/src/main/java/org/jeecg/modules/commonBrandProduct/vue/CommonBrandProductList.vue

@@ -0,0 +1,222 @@
+<template>
+  <a-card :bordered="false">
+    <!-- 查询区域 -->
+    <div class="table-page-search-wrapper">
+      <a-form layout="inline" @keyup.enter.native="searchQuery">
+        <a-row :gutter="24">
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="品牌">
+              <j-search-select-tag placeholder="请选择品牌" v-model="queryParam.brandId" dict="common_vip,name,id"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <a-form-item label="商品">
+              <j-search-select-tag placeholder="请选择商品" v-model="queryParam.shopId" dict="common_shop,name,id"/>
+            </a-form-item>
+          </a-col>
+          <a-col :xl="6" :lg="7" :md="8" :sm="24">
+            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
+              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
+              <a @click="handleToggleSearch" style="margin-left: 8px">
+                {{ toggleSearchStatus ? '收起' : '展开' }}
+                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
+              </a>
+            </span>
+          </a-col>
+        </a-row>
+      </a-form>
+    </div>
+    <!-- 查询区域-END -->
+
+    <!-- 操作按钮区域 -->
+    <div class="table-operator">
+      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
+      <a-button type="primary" icon="download" @click="handleExportXls('品牌款式')">导出</a-button>
+      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
+        <a-button type="primary" icon="import">导入</a-button>
+      </a-upload>
+      <!-- 高级查询区域 -->
+      <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
+      <a-dropdown v-if="selectedRowKeys.length > 0">
+        <a-menu slot="overlay">
+          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
+        </a-menu>
+        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
+      </a-dropdown>
+    </div>
+
+    <!-- table区域-begin -->
+    <div>
+      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
+        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
+        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
+      </div>
+
+      <a-table
+        ref="table"
+        size="middle"
+        :scroll="{x:true}"
+        bordered
+        rowKey="id"
+        :columns="columns"
+        :dataSource="dataSource"
+        :pagination="ipagination"
+        :loading="loading"
+        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
+        class="j-table-force-nowrap"
+        @change="handleTableChange">
+
+        <template slot="htmlSlot" slot-scope="text">
+          <div v-html="text"></div>
+        </template>
+        <template slot="imgSlot" slot-scope="text,record">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span>
+          <img v-else :src="getImgView(text)" :preview="record.id" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/>
+        </template>
+        <template slot="fileSlot" slot-scope="text">
+          <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+          <a-button
+            v-else
+            :ghost="true"
+            type="primary"
+            icon="download"
+            size="small"
+            @click="downloadFile(text)">
+            下载
+          </a-button>
+        </template>
+
+        <span slot="action" slot-scope="text, record">
+          <a @click="handleEdit(record)">编辑</a>
+
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="handleDetail(record)">详情</a>
+              </a-menu-item>
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+                  <a>删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+      </a-table>
+    </div>
+
+    <common-brand-product-modal ref="modalForm" @ok="modalFormOk"></common-brand-product-modal>
+  </a-card>
+</template>
+
+<script>
+
+  import '@/assets/less/TableExpand.less'
+  import { mixinDevice } from '@/utils/mixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+  import CommonBrandProductModal from './modules/CommonBrandProductModal'
+  import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
+
+  export default {
+    name: 'CommonBrandProductList',
+    mixins:[JeecgListMixin, mixinDevice],
+    components: {
+      CommonBrandProductModal
+    },
+    data () {
+      return {
+        description: '品牌款式管理页面',
+        // 表头
+        columns: [
+          {
+            title: '#',
+            dataIndex: '',
+            key:'rowIndex',
+            width:60,
+            align:"center",
+            customRender:function (t,r,index) {
+              return parseInt(index)+1;
+            }
+          },
+          {
+            title:'款式名称',
+            align:"center",
+            dataIndex: 'name'
+          },
+          {
+            title:'款式图片',
+            align:"center",
+            dataIndex: 'image'
+          },
+          {
+            title:'最低价格',
+            align:"center",
+            dataIndex: 'minPrice'
+          },
+          {
+            title:'最高价格',
+            align:"center",
+            dataIndex: 'maxPrice'
+          },
+          {
+            title:'品牌',
+            align:"center",
+            dataIndex: 'brandId_dictText'
+          },
+          {
+            title:'商品',
+            align:"center",
+            dataIndex: 'shopId_dictText'
+          },
+          {
+            title: '操作',
+            dataIndex: 'action',
+            align:"center",
+            fixed:"right",
+            width:147,
+            scopedSlots: { customRender: 'action' }
+          }
+        ],
+        url: {
+          list: "/commonBrandProduct/commonBrandProduct/list",
+          delete: "/commonBrandProduct/commonBrandProduct/delete",
+          deleteBatch: "/commonBrandProduct/commonBrandProduct/deleteBatch",
+          exportXlsUrl: "/commonBrandProduct/commonBrandProduct/exportXls",
+          importExcelUrl: "commonBrandProduct/commonBrandProduct/importExcel",
+          
+        },
+        dictOptions:{},
+        superFieldList:[],
+      }
+    },
+    created() {
+    this.getSuperFieldList();
+    },
+    computed: {
+      importExcelUrl: function(){
+        return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
+      },
+    },
+    methods: {
+      initDictConfig(){
+      },
+      getSuperFieldList(){
+        let fieldList=[];
+        fieldList.push({type:'string',value:'name',text:'款式名称',dictCode:''})
+        fieldList.push({type:'string',value:'image',text:'款式图片',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'minPrice',text:'最低价格',dictCode:''})
+        fieldList.push({type:'BigDecimal',value:'maxPrice',text:'最高价格',dictCode:''})
+        fieldList.push({type:'sel_search',value:'brandId',text:'品牌',dictTable:"common_vip", dictText:'name', dictCode:'id'})
+        fieldList.push({type:'sel_search',value:'shopId',text:'商品',dictTable:"common_shop", dictText:'name', dictCode:'id'})
+        this.superFieldList = fieldList
+      }
+    }
+  }
+</script>
+<style scoped>
+  @import '~@assets/less/common.less';
+</style>

module-common/src/main/java/org/jeecg/modules/commonBrandProduct/vue/modules/CommonBrandProductForm.vue

@@ -0,0 +1,129 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <j-form-container :disabled="formDisabled">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
+        <a-row>
+          <a-col :span="24">
+            <a-form-model-item label="款式名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
+              <a-input v-model="model.name" placeholder="请输入款式名称"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="款式图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="image">
+              <a-input v-model="model.image" placeholder="请输入款式图片"  ></a-input>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="最低价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="minPrice">
+              <a-input-number v-model="model.minPrice" placeholder="请输入最低价格" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="最高价格" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="maxPrice">
+              <a-input-number v-model="model.maxPrice" placeholder="请输入最高价格" style="width: 100%" />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="品牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brandId">
+              <j-search-select-tag v-model="model.brandId" dict="common_vip,name,id"  />
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="24">
+            <a-form-model-item label="商品" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="shopId">
+              <j-search-select-tag v-model="model.shopId" dict="common_shop,name,id"  />
+            </a-form-model-item>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </j-form-container>
+  </a-spin>
+</template>
+
+<script>
+
+  import { httpAction, getAction } from '@/api/manage'
+  import { validateDuplicateValue } from '@/utils/util'
+
+  export default {
+    name: 'CommonBrandProductForm',
+    components: {
+    },
+    props: {
+      //表单禁用
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
+    data () {
+      return {
+        model:{
+         },
+        labelCol: {
+          xs: { span: 24 },
+          sm: { span: 5 },
+        },
+        wrapperCol: {
+          xs: { span: 24 },
+          sm: { span: 16 },
+        },
+        confirmLoading: false,
+        validatorRules: {
+        },
+        url: {
+          add: "/commonBrandProduct/commonBrandProduct/add",
+          edit: "/commonBrandProduct/commonBrandProduct/edit",
+          queryById: "/commonBrandProduct/commonBrandProduct/queryById"
+        }
+      }
+    },
+    computed: {
+      formDisabled(){
+        return this.disabled
+      },
+    },
+    created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
+    methods: {
+      add () {
+        this.edit(this.modelDefault);
+      },
+      edit (record) {
+        this.model = Object.assign({}, record);
+        this.visible = true;
+      },
+      submitForm () {
+        const that = this;
+        // 触发表单验证
+        this.$refs.form.validate(valid => {
+          if (valid) {
+            that.confirmLoading = true;
+            let httpurl = '';
+            let method = '';
+            if(!this.model.id){
+              httpurl+=this.url.add;
+              method = 'post';
+            }else{
+              httpurl+=this.url.edit;
+               method = 'put';
+            }
+            httpAction(httpurl,this.model,method).then((res)=>{
+              if(res.success){
+                that.$message.success(res.message);
+                that.$emit('ok');
+              }else{
+                that.$message.warning(res.message);
+              }
+            }).finally(() => {
+              that.confirmLoading = false;
+            })
+          }
+         
+        })
+      },
+    }
+  }
+</script>

module-common/src/main/java/org/jeecg/modules/commonBrandProduct/vue/modules/CommonBrandProductModal.Style#Drawer.vue

@@ -0,0 +1,84 @@
+<template>
+  <a-drawer
+    :title="title"
+    :width="width"
+    placement="right"
+    :closable="false"
+    @close="close"
+    destroyOnClose
+    :visible="visible">
+    <common-brand-product-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></common-brand-product-form>
+    <div class="drawer-footer">
+      <a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button>
+      <a-button v-if="!disableSubmit"  @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button>
+    </div>
+  </a-drawer>
+</template>
+
+<script>
+
+  import CommonBrandProductForm from './CommonBrandProductForm'
+
+  export default {
+    name: 'CommonBrandProductModal',
+    components: {
+      CommonBrandProductForm
+    },
+    data () {
+      return {
+        title:"操作",
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        });
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>
+
+<style lang="less" scoped>
+/** Button按钮间距 */
+  .ant-btn {
+    margin-left: 30px;
+    margin-bottom: 30px;
+    float: right;
+  }
+  .drawer-footer{
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+</style>

module-common/src/main/java/org/jeecg/modules/commonBrandProduct/vue/modules/CommonBrandProductModal.vue

@@ -0,0 +1,60 @@
+<template>
+  <j-modal
+    :title="title"
+    :width="width"
+    :visible="visible"
+    switchFullscreen
+    @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
+    @cancel="handleCancel"
+    cancelText="关闭">
+    <common-brand-product-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></common-brand-product-form>
+  </j-modal>
+</template>
+
+<script>
+
+  import CommonBrandProductForm from './CommonBrandProductForm'
+  export default {
+    name: 'CommonBrandProductModal',
+    components: {
+      CommonBrandProductForm
+    },
+    data () {
+      return {
+        title:'',
+        width:800,
+        visible: false,
+        disableSubmit: false
+      }
+    },
+    methods: {
+      add () {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.add();
+        })
+      },
+      edit (record) {
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
+      },
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.submitForm();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
+      }
+    }
+  }
+</script>

module-common/src/main/java/org/jeecg/modules/commonBrandProduct/vue3/CommonBrandProduct.api.ts

@@ -0,0 +1,61 @@
+import {defHttp} from '/@/utils/http/axios';
+import {Modal} from 'ant-design-vue';
+
+enum Api {
+  list = '/commonBrandProduct/commonBrandProduct/list',
+  save='/commonBrandProduct/commonBrandProduct/add',
+  edit='/commonBrandProduct/commonBrandProduct/edit',
+  deleteOne = '/commonBrandProduct/commonBrandProduct/delete',
+  deleteBatch = '/commonBrandProduct/commonBrandProduct/deleteBatch',
+  importExcel = '/commonBrandProduct/commonBrandProduct/importExcel',
+  exportXls = '/commonBrandProduct/commonBrandProduct/exportXls',
+}
+/**
+ * 导出api
+ * @param params
+ */
+export const getExportUrl = Api.exportXls;
+/**
+ * 导入api
+ */
+export const getImportUrl = Api.importExcel;
+/**
+ * 列表接口
+ * @param params
+ */
+export const list = (params) =>
+  defHttp.get({url: Api.list, params});
+
+/**
+ * 删除单个
+ */
+export const deleteOne = (params,handleSuccess) => {
+  return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+/**
+ * 批量删除
+ * @param params
+ */
+export const batchDelete = (params, handleSuccess) => {
+  Modal.confirm({
+    title: '确认删除',
+    content: '是否删除选中数据',
+    okText: '确认',
+    cancelText: '取消',
+    onOk: () => {
+      return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => {
+        handleSuccess();
+      });
+    }
+  });
+}
+/**
+ * 保存或者更新
+ * @param params
+ */
+export const saveOrUpdate = (params, isUpdate) => {
+  let url = isUpdate ? Api.edit : Api.save;
+  return defHttp.post({url: url, params});
+}

module-common/src/main/java/org/jeecg/modules/commonBrandProduct/vue3/CommonBrandProduct.data.ts

@@ -0,0 +1,97 @@
+import {BasicColumn} from '/@/components/Table';
+import {FormSchema} from '/@/components/Table';
+import { rules} from '/@/utils/helper/validator';
+import { render } from '/@/utils/common/renderUtils';
+//列表数据
+export const columns: BasicColumn[] = [
+    {
+    title: '款式名称',
+    align:"center",
+    dataIndex: 'name'
+   },
+   {
+    title: '款式图片',
+    align:"center",
+    dataIndex: 'image'
+   },
+   {
+    title: '最低价格',
+    align:"center",
+    dataIndex: 'minPrice'
+   },
+   {
+    title: '最高价格',
+    align:"center",
+    dataIndex: 'maxPrice'
+   },
+   {
+    title: '品牌',
+    align:"center",
+    dataIndex: 'brandId_dictText'
+   },
+   {
+    title: '商品',
+    align:"center",
+    dataIndex: 'shopId_dictText'
+   },
+];
+//查询数据
+export const searchFormSchema: FormSchema[] = [
+	{
+      label: "品牌",
+      field: "brandId",
+      component: 'JSearchSelect',
+      componentProps:{
+         dict:"common_vip,name,id"
+      },
+      colProps: {span: 6},
+ 	},
+	{
+      label: "商品",
+      field: "shopId",
+      component: 'JSearchSelect',
+      componentProps:{
+         dict:"common_shop,name,id"
+      },
+      colProps: {span: 6},
+ 	},
+];
+//表单数据
+export const formSchema: FormSchema[] = [
+  {
+    label: '款式名称',
+    field: 'name',
+    component: 'Input',
+  },
+  {
+    label: '款式图片',
+    field: 'image',
+    component: 'Input',
+  },
+  {
+    label: '最低价格',
+    field: 'minPrice',
+    component: 'InputNumber',
+  },
+  {
+    label: '最高价格',
+    field: 'maxPrice',
+    component: 'InputNumber',
+  },
+  {
+    label: '品牌',
+    field: 'brandId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"common_vip,name,id"
+    },
+  },
+  {
+    label: '商品',
+    field: 'shopId',
+    component: 'JSearchSelect',
+    componentProps:{
+       dict:"common_shop,name,id"
+    },
+  },
+];

module-common/src/main/java/org/jeecg/modules/commonBrandProduct/vue3/CommonBrandProductList.vue

@@ -0,0 +1,162 @@
+<template>
+  <div>
+    <!--引用表格-->
+   <BasicTable @register="registerTable" :rowSelection="rowSelection">
+     <!--插槽:table标题-->
+      <template #tableTitle>
+          <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button>
+          <a-button  type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button>
+          <j-upload-button  type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button>
+          <a-dropdown v-if="checkedKeys.length > 0">
+              <template #overlay>
+                <a-menu>
+                  <a-menu-item key="1" @click="batchHandleDelete">
+                    <Icon icon="ant-design:delete-outlined"></Icon>
+                    删除
+                  </a-menu-item>
+                </a-menu>
+              </template>
+              <a-button>批量操作
+                <Icon icon="mdi:chevron-down"></Icon>
+              </a-button>
+        </a-dropdown>
+      </template>
+       <!--操作栏-->
+      <template #action="{ record }">
+        <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/>
+      </template>
+      <!--字段回显插槽-->
+      <template #htmlSlot="{text}">
+         <div v-html="text"></div>
+      </template>
+      <template #fileSlot="{text}">
+         <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
+         <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button>
+      </template>
+    </BasicTable>
+    <!-- 表单区域 -->
+    <CommonBrandProductModal @register="registerModal" @success="handleSuccess"></CommonBrandProductModal>
+  </div>
+</template>
+
+<script lang="ts" name="commonBrandProduct-commonBrandProduct" setup>
+  import {ref, computed, unref} from 'vue';
+  import {BasicTable, useTable, TableAction} from '/@/components/Table';
+  import {useModal} from '/@/components/Modal';
+  import { useListPage } from '/@/hooks/system/useListPage'
+  import CommonBrandProductModal from './components/CommonBrandProductModal.vue'
+  import {columns, searchFormSchema} from './commonBrandProduct.data';
+  import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './commonBrandProduct.api';
+  const checkedKeys = ref<Array<string | number>>([]);
+  //注册model
+  const [registerModal, {openModal}] = useModal();
+  //注册table数据
+  const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({
+      tableProps:{
+           title: '品牌款式',
+           api: list,
+           columns,
+           canResize:false,
+           formConfig: {
+              labelWidth: 120,
+              schemas: searchFormSchema,
+              autoSubmitOnEnter:true,
+              showAdvancedButton:true,
+              fieldMapToTime: [
+              ],
+            },
+           actionColumn: {
+               width: 120,
+            },
+      },
+       exportConfig: {
+            name:"品牌款式",
+            url: getExportUrl,
+          },
+          importConfig: {
+            url: getImportUrl
+          },
+  })
+
+  const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
+
+   /**
+    * 新增事件
+    */
+  function handleAdd() {
+     openModal(true, {
+       isUpdate: false,
+       showFooter: true,
+     });
+  }
+   /**
+    * 编辑事件
+    */
+  function handleEdit(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: true,
+     });
+   }
+   /**
+    * 详情
+   */
+  function handleDetail(record: Recordable) {
+     openModal(true, {
+       record,
+       isUpdate: true,
+       showFooter: false,
+     });
+   }
+   /**
+    * 删除事件
+    */
+  async function handleDelete(record) {
+     await deleteOne({id: record.id}, reload);
+   }
+   /**
+    * 批量删除事件
+    */
+  async function batchHandleDelete() {
+     await batchDelete({ids: checkedKeys.value}, reload);
+   }
+   /**
+    * 成功回调
+    */
+  function handleSuccess() {
+      reload();
+   }
+   /**
+      * 操作栏
+      */
+  function getTableAction(record){
+       return [
+         {
+           label: '编辑',
+           onClick: handleEdit.bind(null, record),
+         }
+       ]
+   }
+     /**
+        * 下拉操作栏
+        */
+  function getDropDownAction(record){
+      return [
+           {
+             label: '详情',
+             onClick: handleDetail.bind(null, record),
+           }, {
+             label: '删除',
+             popConfirm: {
+               title: '是否确认删除',
+               confirm: handleDelete.bind(null, record),
+             }
+           }
+      ]
+   }
+</script>
+
+<style scoped>
+
+</style>

module-common/src/main/java/org/jeecg/modules/commonBrandProduct/vue3/components/CommonBrandProductModal.vue

@@ -0,0 +1,58 @@
+<template>
+  <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit">
+      <BasicForm @register="registerForm"/>
+  </BasicModal>
+</template>
+
+<script lang="ts" setup>
+    import {ref, computed, unref} from 'vue';
+    import {BasicModal, useModalInner} from '/@/components/Modal';
+    import {BasicForm, useForm} from '/@/components/Form/index';
+    import {formSchema} from '../commonBrandProduct.data';
+    import {saveOrUpdate} from '../commonBrandProduct.api';
+    // Emits声明
+    const emit = defineEmits(['register','success']);
+    const isUpdate = ref(true);
+    //表单配置
+    const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({
+        labelWidth: 150,
+        schemas: formSchema,
+        showActionButtonGroup: false,
+    });
+    //表单赋值
+    const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => {
+        //重置表单
+        await resetFields();
+        setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter});
+        isUpdate.value = !!data?.isUpdate;
+        if (unref(isUpdate)) {
+            //表单赋值
+            await setFieldsValue({
+                ...data.record,
+            });
+        }
+        // 隐藏底部时禁用整个表单
+       setProps({ disabled: !data?.showFooter })
+    });
+    //设置标题
+    const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑'));
+    //表单提交事件
+    async function handleSubmit(v) {
+        try {
+            let values = await validate();
+            setModalProps({confirmLoading: true});
+            //提交表单
+            await saveOrUpdate(values, isUpdate.value);
+            //关闭弹窗
+            closeModal();
+            //刷新列表
+            emit('success');
+        } finally {
+            setModalProps({confirmLoading: false});
+        }
+    }
+</script>
+
+<style lang="less" scoped>
+
+</style>

module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java

@@ -230,6 +230,10 @@ public class CommonOrder implements Serializable {
     @ApiModelProperty(value = "快递员电话")
     private java.lang.String deliveryPhone;
 
+	@Excel(name = "款式ID", width = 15)
+	@ApiModelProperty(value = "款式ID")
+	private String styleId;
+
 
 	@TableField (exist=false)
 	private List<CommonOrder> commonOrderList;//子订单用户
@@ -238,11 +242,14 @@ public class CommonOrder implements Serializable {
 	private List<CommonOrder> orderCheckList;//子订单质检
 
 	/**品牌标识*/
-	@TableField(exist = false)
-	private java.lang.String pinName;
-	/**品牌标识*/
-	@TableField(exist = false)
-	private List<String> testingInstructionsText;
+    @TableField(exist = false)
+    private java.lang.String pinName;
+    /**款式名称*/
+    @TableField(exist = false)
+    private java.lang.String styleName;
+    /**品牌标识*/
+    @TableField(exist = false)
+    private List<String> testingInstructionsText;
 
 	@TableField(exist = false)
 	private LogisticsTrajectory logisticsTrajectory;//当前物流轨迹

module-common/src/main/java/org/jeecg/modules/commonShop/entity/CommonShop.java

@@ -78,33 +78,10 @@ public class CommonShop implements Serializable {
 	@Excel(name = "商品说明", width = 15)
     @ApiModelProperty(value = "商品说明")
     private java.lang.String service;
-//	/**推荐票数*/
-//	@Excel(name = "推荐票数", width = 15)
-//    @ApiModelProperty(value = "推荐票数")
-//    private java.lang.Integer tuiNum;
-//	/**作者累积亲密值*/
-//	@Excel(name = "作者累积亲密值", width = 15)
-//    @ApiModelProperty(value = "作者累积亲密值")
-//    private java.lang.Integer qmNum;
 	/**回收规则*/
 	@Excel(name = "回收规则", width = 15)
     @ApiModelProperty(value = "回收规则")
     private java.lang.String details;
-//	/**作者账户*/
-//	@Excel(name = "作者账户", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
-//	@Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id")
-//    @ApiModelProperty(value = "作者账户")
-//    private java.lang.String userId;
-	/**设置状态*/
-//	@Excel(name = "设置状态", width = 15, dicCode = "book_tool_status")
-//	@Dict(dicCode = "book_tool_status")
-//    @ApiModelProperty(value = "设置状态")
-//    private java.lang.Integer toolStatus;
-	/**作品状态*/
-//	@Excel(name = "作品状态", width = 15, dicCode = "book_my_status")
-//	@Dict(dicCode = "book_my_status")
-//    @ApiModelProperty(value = "作品状态")
-//    private java.lang.Integer bookStatus;
 	/**价格*/
 	@Excel(name = "价格", width = 15)
     @ApiModelProperty(value = "价格")
@@ -122,4 +99,9 @@ public class CommonShop implements Serializable {
 	@Excel(name = "最高价格", width = 15)
 	@ApiModelProperty(value = "最高价格")
 	private java.math.BigDecimal maxPrice;
+
+	/**显示回收规则*/
+	@Excel(name = "显示回收规则", width = 15)
+	@ApiModelProperty(value = "显示回收规则")
+	private String isRecycleRules;
 }

module-common/src/main/java/org/jeecg/modules/commonVip/entity/CommonVip.java

@@ -64,4 +64,12 @@ public class CommonVip implements Serializable {
 	@Excel(name = "品牌图片", width = 15)
     @ApiModelProperty(value = "品牌图片")
     private java.lang.String image;
+    /**是否热门*/
+    @Excel(name = "是否热门", width = 15)
+    @ApiModelProperty(value = "是否热门 1是 0否")
+    private java.lang.String hot;
+    /**品牌分类*/
+    @Excel(name = "品牌分类", width = 15)
+    @ApiModelProperty(value = "品牌分类")
+    private java.lang.String brandCategory;
 }

module-system/src/main/resources/application-dev.yml

@@ -134,7 +134,7 @@ spring:
       #        connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-          url: jdbc:mysql://124.220.221.124:3306/recycle-admin?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
+          url: jdbc:mysql://124.220.221.124:3306/recycle-admin-v2?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&autoReconnect=true&failOverReadOnly=false
           username: root
           password: P=BtQmz-
           driver-class-name: com.mysql.cj.jdbc.Driver