商家结算卡信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shop/business/BusinessController.java

@@ -111,6 +111,15 @@ public class BusinessController extends BaseController {
         return R.ok(businessVo);
     }
 
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
+    @ApiOperation("获取商家详细信息")
+    @SaCheckPermission("business:business:query")
+    @GetMapping("/infoBase")
+    public R<BusinessVo> getInfoBase() {
+        BusinessVo businessVo = iBusinessService.queryById(getBusinessId(true));
+        return R.ok(businessVo);
+    }
+
     /**
      * 新增商家
      */
@@ -347,6 +356,21 @@ public class BusinessController extends BaseController {
         return businessVoTableDataInfo;
     }
 
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
+    @ApiOperation("根据连锁店查连锁店")
+    @SaCheckPermission("business:business:chainPage")
+    @GetMapping("/chainPage")
+    public TableDataInfo<BusinessVo> chainPage(@Validated(QueryGroup.class) BusinessBo bo, PageQuery pageQuery) {
+        Long id = iBusinessService.queryParentBusinessIdById(bo.getBusinessId());
+        if (ObjectUtil.isNull(id)) {
+            return null;
+        }
+        BusinessBo queryBo = new BusinessBo();
+        queryBo.setParentBusinessId(id);
+        return iBusinessService.partnerPage(queryBo, pageQuery);
+    }
+
+
     @ApiOperation("下拉查连锁店")
     @GetMapping("/partnerSelect")
     public R<List<BusinessVo>> partnerSelect(@Validated(QueryGroup.class) BusinessBo bo) {

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shop/product/ProductController.java

@@ -216,6 +216,7 @@ public class ProductController extends BaseController {
     @Log(title = "产品", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(@Validated ProductBo bo, PageQuery pageQuery, HttpServletResponse response) {
+        bo.setBusinessId(getBusinessId(true));
         TableDataInfo<ProductVo> productVoTableDataInfo = iProductService.queryCustomPageList(bo, pageQuery);
         ExcelUtil.exportExcel(productVoTableDataInfo.getRows(), "商品", ProductVo.class, response);
     }

ruoyi-api/src/main/java/com/ruoyi/api/controller/common/CommonController.java

@@ -69,7 +69,6 @@ public class CommonController extends AbstractApiController {
     @ApiImplicitParams({
         @ApiImplicitParam(name = "file", value = "文件", paramType = "query", dataTypeClass = File.class, required = true)
     })
-    @RepeatSubmit()
     @PostMapping("/upload")
     public R<SysOss> upload(@RequestPart("file") MultipartFile file) {
         getUserId();
@@ -88,7 +87,6 @@ public class CommonController extends AbstractApiController {
     @ApiImplicitParams({
         @ApiImplicitParam(name = "file", value = "文件", paramType = "query", dataTypeClass = File.class, required = true)
     })
-    @RepeatSubmit()
     @PostMapping("/uploadOrient")
     public R<SysOss> uploadOrient(@RequestPart("file") MultipartFile file) {
         getUserId();
@@ -120,7 +118,6 @@ public class CommonController extends AbstractApiController {
     @ApiImplicitParams({
         @ApiImplicitParam(name = "image", value = "Base64图片数据", paramType = "query", dataType = "String", required = true)
     })
-    @RepeatSubmit()
     @PostMapping("/uploadBase")
     public R<SysOss> uploadBase(@RequestBody Map<String, String> params) {
         String image = params.get("image");

ruoyi-business/src/main/java/com/ruoyi/agent/domain/vo/AgentVo.java

@@ -55,7 +55,6 @@ public class AgentVo {
      * 头像
      */
     @FilePathValue
-    @ExcelProperty(value = "头像")
     @ApiModelProperty("头像")
     private String headPhoto;
 
@@ -184,7 +183,7 @@ public class AgentVo {
     /**
      * 累计提现金额
      */
-    @ExcelProperty(value = "累计提现金额", index = 12)
+    @ExcelProperty(value = "累计结算", index = 12)
     @ApiModelProperty("累计提现金额")
     private BigDecimal totalStatisticsWithdrawalAmount;
     /**
@@ -218,7 +217,6 @@ public class AgentVo {
      * 身份证正面照片URL
      */
     @FilePathValue
-    @ExcelProperty(value = "身份证正面照片URL")
     @ApiModelProperty("身份证正面照片URL")
     private String idCardFrontUrl;
 
@@ -226,7 +224,6 @@ public class AgentVo {
      * 身份证反面照片URL
      */
     @FilePathValue
-    @ExcelProperty(value = "身份证反面照片URL")
     @ApiModelProperty("身份证反面照片URL")
     private String idCardBackUrl;
 }

ruoyi-business/src/main/java/com/ruoyi/business/service/IBusinessService.java

@@ -155,4 +155,6 @@ public interface IBusinessService {
     List<Long> queryBusinessIdsByBusinessId(Long businessId);
 
     String loadCustomerServicePhone(Long businessId);
+
+    Long queryParentBusinessIdById(Long businessId);
 }

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BusinessServiceImpl.java

@@ -744,4 +744,10 @@ public class BusinessServiceImpl implements IBusinessService {
         return ObjectUtil.isNotNull(business) ? business.getCustomerServicePhone() : null;
     }
 
+    @Override
+    public Long queryParentBusinessIdById(Long businessId) {
+        Business business = baseMapper.selectOne(new LambdaQueryWrapper<Business>().select(Business::getParentBusinessId).eq(Business::getBusinessId, businessId));
+        return ObjectUtil.isNotNull(business) ? business.getParentBusinessId() : null;
+    }
+
 }

ruoyi-shop/src/main/java/com/ruoyi/shop/product/convert/ProductCategoryListConverter.java

@@ -0,0 +1,25 @@
+package com.ruoyi.shop.product.convert;
+
+import com.alibaba.excel.converters.Converter;
+import com.alibaba.excel.metadata.GlobalConfiguration;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.metadata.property.ExcelContentProperty;
+import com.ruoyi.shop.product.domain.vo.ProductCategoryRelationVo;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+public class ProductCategoryListConverter implements Converter<List<ProductCategoryRelationVo>> {
+    @Override
+    public WriteCellData<?> convertToExcelData(List<ProductCategoryRelationVo> value,
+                                               ExcelContentProperty contentProperty,
+                                               GlobalConfiguration globalConfiguration) {
+        // 拼接名称字段（假设ProductCategoryRelationVo有getName()方法）
+        String names = value.stream()
+            .map(ProductCategoryRelationVo::getCategoryName)
+            .filter(Objects::nonNull)
+            .collect(Collectors.joining(","));
+        return new WriteCellData<>(names);
+    }
+}

ruoyi-shop/src/main/java/com/ruoyi/shop/product/domain/vo/ProductVo.java

@@ -1,42 +1,33 @@
 package com.ruoyi.shop.product.domain.vo;
 
-import java.math.BigDecimal;
-
-import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.ruoyi.common.annotation.ExcelDictFormat;
 import com.ruoyi.common.convert.ExcelBooleanConvert;
 import com.ruoyi.common.convert.ExcelEnumConvert;
 import com.ruoyi.common.core.domain.BaseVo;
-import com.ruoyi.common.core.validate.AddGroup;
-import com.ruoyi.common.core.validate.EditGroup;
 import com.ruoyi.common.enums.AuditStatus;
 import com.ruoyi.common.enums.ProductUseType;
 import com.ruoyi.common.filepathsplicing.FilePathRich;
 import com.ruoyi.common.filepathsplicing.FilePathValue;
-import com.ruoyi.common.typehandler.ListToStringTypeHandler;
 import com.ruoyi.shop.enums.ProductPaymentMode;
 import com.ruoyi.shop.merchant.domain.vo.MerchantCategoryVo;
 import com.ruoyi.shop.merchant.service.IMerchantCategoryService;
+import com.ruoyi.shop.product.convert.ProductCategoryListConverter;
 import com.ruoyi.shop.product.domain.ProductContent;
 import com.ruoyi.shop.product.service.IProductCategoryRelationService;
 import com.ruoyi.shop.product.service.IProductContentService;
 import com.ruoyi.shop.product.service.IProductSkuSetService;
 import com.ruoyi.shop.supplier.domain.vo.SupplierVo;
 import com.ruoyi.shop.supplier.service.ISupplierService;
-import com.ruoyi.shop.typehandler.ListToSkuTableItemTypeHandler;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.hibernate.validator.constraints.Length;
 
-import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 
 
@@ -56,7 +47,6 @@ public class ProductVo extends BaseVo {
     /**
      * 主键ID
      */
-    @ExcelProperty(value = "主键ID")
     @ApiModelProperty("主键ID")
     private Long productId;
 
@@ -90,7 +80,6 @@ public class ProductVo extends BaseVo {
     /**
      * 商品码SPU
      */
-    @ExcelProperty(value = "商品码SPU")
     @ApiModelProperty("商品码SPU")
     private String productCode;
 
@@ -161,14 +150,12 @@ public class ProductVo extends BaseVo {
      * 最小兑换积分数
      */
     @ApiModelProperty(value = "最小兑换积分数", required = true)
-    @ExcelProperty(value = "最小兑换积分数")
     private BigDecimal minPoints;
 
     /**
      * 最大兑换积分数
      */
     @ApiModelProperty(value = "最大兑换积分数", required = true)
-    @ExcelProperty(value = "最大兑换积分数")
     private BigDecimal maxPoints;
 
 
@@ -224,21 +211,26 @@ public class ProductVo extends BaseVo {
 
 
     @ApiModelProperty("分类名称")
-    @ExcelProperty(value = "分类名称")
+    @ExcelProperty(value = "平台分类")
     private String merchantCategoryName;
 
+    @ExcelProperty(value = "分类名称", converter = ProductCategoryListConverter.class)
+    @ApiModelProperty("商品分类关系")
+    private List<ProductCategoryRelationVo> productCategoryList;
 
-
+    /**
+     * 加载商品分类关系信息
+     */
+    public void loadProductCategoryList() {
+        IProductCategoryRelationService service = SpringUtil.getBean("productCategoryRelationServiceImpl", IProductCategoryRelationService.class);
+        this.productCategoryList = service.loadByProductId(this.productId);
+    }
 
     @ApiModelProperty("商家名称")
     @ExcelProperty(value = "商家名称")
     private String businessName;
 
-
-
-
     @ApiModelProperty("供应商")
-    @ExcelProperty(value = "分类名称")
     private String supplierName;
 
 
@@ -252,16 +244,12 @@ public class ProductVo extends BaseVo {
     /**
      * 是否新品（false：否，true：是）
      */
-    @ExcelProperty(value = "是否新品", converter = ExcelBooleanConvert.class)
-    @ExcelDictFormat(readConverterExp = "true=是,false=否")
     @ApiModelProperty("是否新品")
     private Boolean newStatus;
 
     /**
      * 是否推荐置顶（false：否，true：是）
      */
-    @ExcelProperty(value = "是否推荐置顶", converter = ExcelBooleanConvert.class)
-    @ExcelDictFormat(readConverterExp = "true=是,false=否")
     @ApiModelProperty("是否推荐置顶")
     private Boolean recommendStatus;
 
@@ -428,15 +416,4 @@ public class ProductVo extends BaseVo {
         this.productSkuSetList = service.loadVoByBusinessIdAndProductId(this.businessId,this.productId);
         this.stock = this.productSkuSetList.stream().mapToInt(ProductSkuSetVo::getStock).sum();
     }
-
-    @ApiModelProperty("商品分类关系")
-    private List<ProductCategoryRelationVo> productCategoryList;
-
-    /**
-     * 加载商品分类关系信息
-     */
-    public void loadProductCategoryList() {
-        IProductCategoryRelationService service = SpringUtil.getBean("productCategoryRelationServiceImpl", IProductCategoryRelationService.class);
-        this.productCategoryList = service.loadByProductId(this.productId);
-    }
 }