From efb6f9d656f72c3016d738f079c92de021b9f14f Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 04 十二月 2024 10:04:41 +0800
Subject: [PATCH] 1.常规配置-基本配置 2.分类-修改分类名称批量修改商品名称
---
src/main/java/com/mzl/flower/entity/configParam/ConfigParamDO.java | 92 +++++++
src/main/java/com/mzl/flower/web/v2/configParam/ConfigParamGroupController.java | 74 +++++
src/main/java/com/mzl/flower/dto/response/configParam/ConfigParamGroupVO.java | 4
src/main/resources/mapper/configParam/ConfigParamGroupMapper.xml | 18 +
src/main/java/com/mzl/flower/dto/request/configParam/QueryConfigParamDTO.java | 19 +
src/main/java/com/mzl/flower/service/impl/ConfigParamServiceImpl.java | 85 ++++++
src/main/resources/mapper/configParam/ConfigParamGroupMapperCustom.xml | 18 +
src/main/java/com/mzl/flower/dto/request/configParam/CreateConfigParamDTO.java | 19 +
src/main/java/com/mzl/flower/web/v2/configParam/ConfigParamController.java | 92 +++++++
src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java | 3
src/main/java/com/mzl/flower/enums/ConfigParamEnum.java | 20 +
src/main/java/com/mzl/flower/mapper/configParam/ConfigParamMapperCustom.java | 16 +
src/main/java/com/mzl/flower/entity/configParam/ConfigParamGroupDO.java | 37 ++
src/main/resources/mapper/flower/FlowerMapper.xml | 2
src/main/java/com/mzl/flower/service/ConfigParamGroupService.java | 22 +
src/main/java/com/mzl/flower/service/ConfigParamService.java | 26 ++
src/main/java/com/mzl/flower/service/impl/ConfigParamGroupServiceImpl.java | 37 ++
src/main/resources/mapper/configParam/ConfigParamMapper.xml | 30 ++
src/main/java/com/mzl/flower/dto/request/configParam/CreateConfigParamGroupDTO.java | 14 +
src/main/java/com/mzl/flower/dto/request/configParam/UpdateConfigParamDTO.java | 17 +
src/main/java/com/mzl/flower/mapper/configParam/ConfigParamGroupMapperCustom.java | 16 +
src/main/java/com/mzl/flower/config/ResourceServerConfig.java | 1
src/main/java/com/mzl/flower/dto/request/configParam/QueryConfigParamGroupDTO.java | 14 +
src/main/java/com/mzl/flower/mapper/configParam/ConfigParamGroupMapper.java | 16 +
src/main/resources/mapper/configParam/ConfigParamMapperCustom.xml | 26 ++
src/main/java/com/mzl/flower/dto/response/configParam/ConfigParamVO.java | 7
src/main/java/com/mzl/flower/mapper/configParam/ConfigParamMapper.java | 16 +
27 files changed, 739 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mzl/flower/config/ResourceServerConfig.java b/src/main/java/com/mzl/flower/config/ResourceServerConfig.java
index 416a92e..a16ee31 100644
--- a/src/main/java/com/mzl/flower/config/ResourceServerConfig.java
+++ b/src/main/java/com/mzl/flower/config/ResourceServerConfig.java
@@ -59,6 +59,7 @@
.antMatchers("/api/v2/coupon/home/alert").permitAll()
.antMatchers("/api/customer/partner/name").permitAll()
.antMatchers("/api/v2/coupon/app/home/alert").permitAll()
+ .antMatchers("/v2/config-param/base/info").permitAll()
.antMatchers("/api/**").authenticated();//配置访问控制，必须认证过后才可以访问
}
diff --git a/src/main/java/com/mzl/flower/dto/request/configParam/CreateConfigParamDTO.java b/src/main/java/com/mzl/flower/dto/request/configParam/CreateConfigParamDTO.java
new file mode 100644
index 0000000..25c4ee4
--- /dev/null
+++ b/src/main/java/com/mzl/flower/dto/request/configParam/CreateConfigParamDTO.java
@@ -0,0 +1,19 @@
+package com.mzl.flower.dto.request.configParam;
+
+import lombok.Data;
+
+@Data
+public class CreateConfigParamDTO {
+
+ private Integer paramGroupId;
+ private String paramGroup;
+ private String paramGroupName;
+ private String paramName;
+ private String paramKey;
+ private String paramValue;
+ private String paramPlaceholder;
+ private String paramTip;
+ private Integer paramOrder;
+ private Integer paramValueType;
+ private String paramDict;
+}
diff --git a/src/main/java/com/mzl/flower/dto/request/configParam/CreateConfigParamGroupDTO.java b/src/main/java/com/mzl/flower/dto/request/configParam/CreateConfigParamGroupDTO.java
new file mode 100644
index 0000000..384b696
--- /dev/null
+++ b/src/main/java/com/mzl/flower/dto/request/configParam/CreateConfigParamGroupDTO.java
@@ -0,0 +1,14 @@
+package com.mzl.flower.dto.request.configParam;
+
+import lombok.Data;
+
+@Data
+public class CreateConfigParamGroupDTO {
+
+ private String paramGroup;
+
+ private String paramGroupName;
+
+ private Integer paramOrder;
+
+}
diff --git a/src/main/java/com/mzl/flower/dto/request/configParam/QueryConfigParamDTO.java b/src/main/java/com/mzl/flower/dto/request/configParam/QueryConfigParamDTO.java
new file mode 100644
index 0000000..a51297d
--- /dev/null
+++ b/src/main/java/com/mzl/flower/dto/request/configParam/QueryConfigParamDTO.java
@@ -0,0 +1,19 @@
+package com.mzl.flower.dto.request.configParam;
+
+import lombok.Data;
+
+@Data
+public class QueryConfigParamDTO {
+
+ private Integer paramGroupId;
+ private String paramGroup;
+ private String paramGroupName;
+ private String paramName;
+ private String paramKey;
+ private String paramValue;
+ private String paramPlaceholder;
+ private String paramTip;
+ private Integer paramOrder;
+ private Integer paramValueType;
+ private String paramDict;
+}
diff --git a/src/main/java/com/mzl/flower/dto/request/configParam/QueryConfigParamGroupDTO.java b/src/main/java/com/mzl/flower/dto/request/configParam/QueryConfigParamGroupDTO.java
new file mode 100644
index 0000000..f43e0aa
--- /dev/null
+++ b/src/main/java/com/mzl/flower/dto/request/configParam/QueryConfigParamGroupDTO.java
@@ -0,0 +1,14 @@
+package com.mzl.flower.dto.request.configParam;
+
+import lombok.Data;
+
+@Data
+public class QueryConfigParamGroupDTO {
+
+ private String paramGroup;
+
+ private String paramGroupName;
+
+ private Integer paramOrder;
+
+}
diff --git a/src/main/java/com/mzl/flower/dto/request/configParam/UpdateConfigParamDTO.java b/src/main/java/com/mzl/flower/dto/request/configParam/UpdateConfigParamDTO.java
new file mode 100644
index 0000000..64cc665
--- /dev/null
+++ b/src/main/java/com/mzl/flower/dto/request/configParam/UpdateConfigParamDTO.java
@@ -0,0 +1,17 @@
+package com.mzl.flower.dto.request.configParam;
+
+import com.mzl.flower.entity.configParam.ConfigParamDO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@Data
+public class UpdateConfigParamDTO {
+
+ @ApiModelProperty("参数列表不能为空")
+ @NotNull(message = "参数列表不能为空")
+ private List<ConfigParamDO> paramList;
+
+}
diff --git a/src/main/java/com/mzl/flower/dto/response/configParam/ConfigParamGroupVO.java b/src/main/java/com/mzl/flower/dto/response/configParam/ConfigParamGroupVO.java
new file mode 100644
index 0000000..3556c49
--- /dev/null
+++ b/src/main/java/com/mzl/flower/dto/response/configParam/ConfigParamGroupVO.java
@@ -0,0 +1,4 @@
+package com.mzl.flower.dto.response.configParam;
+
+public class ConfigParamGroupVO {
+}
diff --git a/src/main/java/com/mzl/flower/dto/response/configParam/ConfigParamVO.java b/src/main/java/com/mzl/flower/dto/response/configParam/ConfigParamVO.java
new file mode 100644
index 0000000..093ca25
--- /dev/null
+++ b/src/main/java/com/mzl/flower/dto/response/configParam/ConfigParamVO.java
@@ -0,0 +1,7 @@
+package com.mzl.flower.dto.response.configParam;
+
+import lombok.Data;
+
+@Data
+public class ConfigParamVO {
+}
diff --git a/src/main/java/com/mzl/flower/entity/configParam/ConfigParamDO.java b/src/main/java/com/mzl/flower/entity/configParam/ConfigParamDO.java
new file mode 100644
index 0000000..e9f6a45
--- /dev/null
+++ b/src/main/java/com/mzl/flower/entity/configParam/ConfigParamDO.java
@@ -0,0 +1,92 @@
+package com.mzl.flower.entity.configParam;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mzl.flower.base.BaseAutoEntity;
+import com.mzl.flower.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @author @TaoJie
+ * @since 2024-12-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("t_config_param")
+public class ConfigParamDO extends BaseAutoEntity {
+
+
+ /**
+ * 变量分组id
+ */
+ private Integer paramGroupId;
+
+ /**
+ * 变量分组
+ */
+ private String paramGroup;
+
+ /**
+ * 变量分组名
+ */
+ private String paramGroupName;
+
+ /**
+ * 变量名
+ */
+ private String paramName;
+
+ /**
+ * 变量键
+ */
+ private String paramKey;
+
+ /**
+ * 变量值
+ */
+ private String paramValue;
+
+ /**
+ * 变量规则
+ */
+ private String paramPlaceholder;
+
+ /**
+ * 变量提示
+ */
+ private String paramTip;
+
+ /**
+ * 变量排序号
+ */
+ private Integer paramOrder;
+
+ /**
+ * 0 单值 1 多选 2数组JSON
+ */
+ private Integer paramValueType;
+
+ /**
+ * 变量字典
+ */
+ private String paramDict;
+
+ /**
+ * 控件类型
+ */
+ private String paramControlType;
+
+ /**
+ * 是否是必填项目
+ */
+ private Integer paramRequire;
+
+ /**
+ * 参数个数限制数量
+ */
+ private Integer paramLimit;
+
+
+}
diff --git a/src/main/java/com/mzl/flower/entity/configParam/ConfigParamGroupDO.java b/src/main/java/com/mzl/flower/entity/configParam/ConfigParamGroupDO.java
new file mode 100644
index 0000000..ff823b2
--- /dev/null
+++ b/src/main/java/com/mzl/flower/entity/configParam/ConfigParamGroupDO.java
@@ -0,0 +1,37 @@
+package com.mzl.flower.entity.configParam;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.mzl.flower.base.BaseAutoEntity;
+import com.mzl.flower.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @author @TaoJie
+ * @since 2024-12-02
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName("t_config_param_group")
+public class ConfigParamGroupDO extends BaseAutoEntity {
+
+
+ /**
+ * 变量分组
+ */
+ private String paramGroup;
+
+ /**
+ * 变量分组名
+ */
+ private String paramGroupName;
+
+ /**
+ * 变量排序号
+ */
+ private Integer paramOrder;
+
+
+}
diff --git a/src/main/java/com/mzl/flower/enums/ConfigParamEnum.java b/src/main/java/com/mzl/flower/enums/ConfigParamEnum.java
new file mode 100644
index 0000000..31bc2df
--- /dev/null
+++ b/src/main/java/com/mzl/flower/enums/ConfigParamEnum.java
@@ -0,0 +1,20 @@
+package com.mzl.flower.enums;
+
+import lombok.Getter;
+
+public enum ConfigParamEnum {
+
+ BASE("base","基本配置"),
+
+ ;
+
+ @Getter
+ private String name;
+
+ private String desc;
+ private ConfigParamEnum(String name, String desc){
+ this.name=name;
+ this.desc=desc;
+ }
+
+}
diff --git a/src/main/java/com/mzl/flower/mapper/configParam/ConfigParamGroupMapper.java b/src/main/java/com/mzl/flower/mapper/configParam/ConfigParamGroupMapper.java
new file mode 100644
index 0000000..7ece2e6
--- /dev/null
+++ b/src/main/java/com/mzl/flower/mapper/configParam/ConfigParamGroupMapper.java
@@ -0,0 +1,16 @@
+package com.mzl.flower.mapper.configParam;
+
+import com.mzl.flower.entity.configParam.ConfigParamGroupDO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author @TaoJie
+ * @since 2024-12-02
+ */
+public interface ConfigParamGroupMapper extends BaseMapper<ConfigParamGroupDO> {
+
+}
diff --git a/src/main/java/com/mzl/flower/mapper/configParam/ConfigParamGroupMapperCustom.java b/src/main/java/com/mzl/flower/mapper/configParam/ConfigParamGroupMapperCustom.java
new file mode 100644
index 0000000..02757d2
--- /dev/null
+++ b/src/main/java/com/mzl/flower/mapper/configParam/ConfigParamGroupMapperCustom.java
@@ -0,0 +1,16 @@
+package com.mzl.flower.mapper.configParam;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mzl.flower.entity.configParam.ConfigParamGroupDO;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author @TaoJie
+ * @since 2024-12-02
+ */
+public interface ConfigParamGroupMapperCustom extends BaseMapper<ConfigParamGroupDO> {
+
+}
diff --git a/src/main/java/com/mzl/flower/mapper/configParam/ConfigParamMapper.java b/src/main/java/com/mzl/flower/mapper/configParam/ConfigParamMapper.java
new file mode 100644
index 0000000..be7b45b
--- /dev/null
+++ b/src/main/java/com/mzl/flower/mapper/configParam/ConfigParamMapper.java
@@ -0,0 +1,16 @@
+package com.mzl.flower.mapper.configParam;
+
+import com.mzl.flower.entity.configParam.ConfigParamDO;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author @TaoJie
+ * @since 2024-12-02
+ */
+public interface ConfigParamMapper extends BaseMapper<ConfigParamDO> {
+
+}
diff --git a/src/main/java/com/mzl/flower/mapper/configParam/ConfigParamMapperCustom.java b/src/main/java/com/mzl/flower/mapper/configParam/ConfigParamMapperCustom.java
new file mode 100644
index 0000000..b0db20a
--- /dev/null
+++ b/src/main/java/com/mzl/flower/mapper/configParam/ConfigParamMapperCustom.java
@@ -0,0 +1,16 @@
+package com.mzl.flower.mapper.configParam;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.mzl.flower.entity.configParam.ConfigParamDO;
+
+/**
+ * <p>
+ * Mapper 接口
+ * </p>
+ *
+ * @author @TaoJie
+ * @since 2024-12-02
+ */
+public interface ConfigParamMapperCustom extends BaseMapper<ConfigParamDO> {
+
+}
diff --git a/src/main/java/com/mzl/flower/service/ConfigParamGroupService.java b/src/main/java/com/mzl/flower/service/ConfigParamGroupService.java
new file mode 100644
index 0000000..ad7719e
--- /dev/null
+++ b/src/main/java/com/mzl/flower/service/ConfigParamGroupService.java
@@ -0,0 +1,22 @@
+package com.mzl.flower.service;
+
+import com.mzl.flower.dto.request.configParam.QueryConfigParamDTO;
+import com.mzl.flower.dto.response.configParam.ConfigParamGroupVO;
+import com.mzl.flower.entity.configParam.ConfigParamGroupDO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author @TaoJie
+ * @since 2024-12-02
+ */
+public interface ConfigParamGroupService extends IService<ConfigParamGroupDO> {
+
+ List<ConfigParamGroupDO> getList(QueryConfigParamDTO dto);
+
+}
diff --git a/src/main/java/com/mzl/flower/service/ConfigParamService.java b/src/main/java/com/mzl/flower/service/ConfigParamService.java
new file mode 100644
index 0000000..5d4a2ab
--- /dev/null
+++ b/src/main/java/com/mzl/flower/service/ConfigParamService.java
@@ -0,0 +1,26 @@
+package com.mzl.flower.service;
+
+import com.mzl.flower.dto.request.configParam.QueryConfigParamDTO;
+import com.mzl.flower.dto.request.configParam.UpdateConfigParamDTO;
+import com.mzl.flower.entity.configParam.ConfigParamDO;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 服务类
+ * </p>
+ *
+ * @author @TaoJie
+ * @since 2024-12-02
+ */
+public interface ConfigParamService extends IService<ConfigParamDO> {
+
+ List<ConfigParamDO> getList(QueryConfigParamDTO dto);
+
+ boolean updateConfigParamBatch(UpdateConfigParamDTO dto);
+
+ Map<String,Object> getBaseInfo();
+}
diff --git a/src/main/java/com/mzl/flower/service/impl/ConfigParamGroupServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/ConfigParamGroupServiceImpl.java
new file mode 100644
index 0000000..c18a054
--- /dev/null
+++ b/src/main/java/com/mzl/flower/service/impl/ConfigParamGroupServiceImpl.java
@@ -0,0 +1,37 @@
+package com.mzl.flower.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mzl.flower.dto.request.configParam.QueryConfigParamDTO;
+import com.mzl.flower.dto.response.configParam.ConfigParamGroupVO;
+import com.mzl.flower.entity.configParam.ConfigParamGroupDO;
+import com.mzl.flower.mapper.configParam.ConfigParamGroupMapper;
+import com.mzl.flower.mapper.configParam.ConfigParamGroupMapperCustom;
+import com.mzl.flower.service.ConfigParamGroupService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author @TaoJie
+ * @since 2024-12-02
+ */
+@Service
+public class ConfigParamGroupServiceImpl extends ServiceImpl<ConfigParamGroupMapper, ConfigParamGroupDO> implements ConfigParamGroupService {
+
+ @Autowired
+ private ConfigParamGroupMapperCustom configParamGroupMapperCustom;
+
+ @Override
+ public List<ConfigParamGroupDO> getList(QueryConfigParamDTO dto) {
+ QueryWrapper<ConfigParamGroupDO> wrapper = new QueryWrapper<>();
+ wrapper.lambda().eq(ConfigParamGroupDO::getDeleted,false)
+ .orderByAsc(ConfigParamGroupDO::getParamOrder);
+ return list(wrapper);
+ }
+}
diff --git a/src/main/java/com/mzl/flower/service/impl/ConfigParamServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/ConfigParamServiceImpl.java
new file mode 100644
index 0000000..6a913d8
--- /dev/null
+++ b/src/main/java/com/mzl/flower/service/impl/ConfigParamServiceImpl.java
@@ -0,0 +1,85 @@
+package com.mzl.flower.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.mzl.flower.config.exception.ValidationException;
+import com.mzl.flower.dto.request.configParam.QueryConfigParamDTO;
+import com.mzl.flower.dto.request.configParam.UpdateConfigParamDTO;
+import com.mzl.flower.entity.configParam.ConfigParamDO;
+import com.mzl.flower.enums.ConfigParamEnum;
+import com.mzl.flower.mapper.configParam.ConfigParamMapper;
+import com.mzl.flower.mapper.configParam.ConfigParamMapperCustom;
+import com.mzl.flower.service.ConfigParamService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 服务实现类
+ * </p>
+ *
+ * @author @TaoJie
+ * @since 2024-12-02
+ */
+@Service
+public class ConfigParamServiceImpl extends ServiceImpl<ConfigParamMapper, ConfigParamDO> implements ConfigParamService {
+
+ @Autowired
+ private ConfigParamMapperCustom configParamMapperCustom;
+
+ @Override
+ public List<ConfigParamDO> getList(QueryConfigParamDTO dto) {
+ QueryWrapper<ConfigParamDO> queryWrapper = new QueryWrapper<>();
+ queryWrapper.lambda().eq(ConfigParamDO::getDeleted,false)
+ .eq(Objects.nonNull(dto.getParamGroupId()),ConfigParamDO::getParamGroupId,dto.getParamGroupId())
+ .eq(StringUtils.isNotBlank(dto.getParamKey()),ConfigParamDO::getParamKey,dto.getParamKey())
+ .eq(StringUtils.isNotBlank(dto.getParamGroup()),ConfigParamDO::getParamGroup,dto.getParamGroup())
+ .eq(StringUtils.isNotBlank(dto.getParamGroupName()),ConfigParamDO::getParamGroupName,dto.getParamGroupName())
+ .eq(StringUtils.isNotBlank(dto.getParamName()),ConfigParamDO::getParamName,dto.getParamName())
+ ;
+ return list(queryWrapper);
+ }
+
+ @Transactional
+ @Override
+ public boolean updateConfigParamBatch(UpdateConfigParamDTO dto) {
+
+ if(CollectionUtils.isNotEmpty(dto.getParamList())){
+ // 遍历循环查找是否存在
+ List<ConfigParamDO> configParamUpdateList = dto.getParamList().stream().map(configParamDO -> {
+ final ConfigParamDO configParamForUpdate = configParamMapperCustom.selectById(configParamDO.getId());
+ if (null == configParamForUpdate) {
+ throw new ValidationException(String.format("ID:{}不存在！", configParamDO.getId()));
+ }
+ configParamForUpdate.setParamValue(configParamDO.getParamValue());
+ return configParamForUpdate;
+ }).collect(Collectors.toList());
+
+ if(CollectionUtils.isNotEmpty(configParamUpdateList)){
+ return saveOrUpdateBatch(configParamUpdateList);
+ }
+
+ }
+ return false;
+ }
+
+ @Override
+ public Map<String,Object> getBaseInfo() {
+ QueryConfigParamDTO dto=new QueryConfigParamDTO();
+ dto.setParamGroup(ConfigParamEnum.BASE.getName());
+ final List<ConfigParamDO> list = getList(dto);
+ // 把数据转换成map ,只需要获取list中单个item的paramKey ，paramValue
+ Map<String, Object> resultMap=new HashMap<>();
+ list.stream().forEach(item -> {
+ resultMap.put(item.getParamKey(),item.getParamValue());
+ });
+
+ return resultMap;
+ }
+}
diff --git a/src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java b/src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java
index d1756a9..5556fe2 100644
--- a/src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java
+++ b/src/main/java/com/mzl/flower/service/impl/report/OrderReportServiceImpl.java
@@ -105,7 +105,7 @@
String[] rowsName = new String[]{"序号","下单日期", "销售额", "花农底价", "平台区间加价", "平台加价", "平台区域加价"
, "合伙人加价", "合伙人区间加价", "会员折扣","优惠券","降级扣款","缺货扣款","补货扣款","售后扣合伙人款","售后扣花农款",
- "售后扣平台款","总包干费","实际销售扎数","利润","结算状态",};
+ "售后扣平台款","总包干费","总销售扎数","实际销售扎数","利润","结算状态",};
List<Object[]> dataList = new ArrayList<>();
int sn = 1;
for (OrderReportResultVO o : list) {
@@ -129,6 +129,7 @@
objs[a++] = o.getOrderFeeSupplier(); // 售后扣花农款
objs[a++] = o.getOrderFeePlatform(); //售后扣平台款
objs[a++] = o.getPartnerTotalFeeAmount(); // 总包干费
+ objs[a++] = o.getOrderNum(); // 总销售扎数
objs[a++] = o.getRealSaleNum(); // 实际销售扎数
objs[a++] = o.getProfitFeeAmount(); //利润
objs[a++] = o.getSettleStatus(); // 结算状态
diff --git a/src/main/java/com/mzl/flower/web/v2/configParam/ConfigParamController.java b/src/main/java/com/mzl/flower/web/v2/configParam/ConfigParamController.java
new file mode 100644
index 0000000..0c523fa
--- /dev/null
+++ b/src/main/java/com/mzl/flower/web/v2/configParam/ConfigParamController.java
@@ -0,0 +1,92 @@
+package com.mzl.flower.web.v2.configParam;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mzl.flower.base.BaseController;
+import com.mzl.flower.base.R;
+import com.mzl.flower.base.ReturnDataDTO;
+import com.mzl.flower.dto.request.configParam.CreateConfigParamDTO;
+import com.mzl.flower.dto.request.configParam.QueryConfigParamDTO;
+import com.mzl.flower.dto.request.configParam.UpdateConfigParamDTO;
+import com.mzl.flower.dto.response.configParam.ConfigParamVO;
+import com.mzl.flower.service.ConfigParamService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.Positive;
+import java.util.Map;
+
+/**
+* @author @TaoJie
+* @since 2024-12-02
+*/
+@RestController
+@RequestMapping("/v2/config-param")
+@Api(value = "系统配置-分组-参数值", tags = "系统配置-分组-参数值")
+public class ConfigParamController extends BaseController {
+
+ @Autowired
+ private ConfigParamService configParamService;
+
+ @PostMapping("")
+ @ApiOperation(value = "新增", notes = "新增")
+ public ResponseEntity<ReturnDataDTO> create(@Validated @RequestBody CreateConfigParamDTO dto) {
+ return returnData(R.SUCCESS.getCode(), null);
+ }
+
+ @PutMapping("/{id}")
+ @ApiOperation(value = "修改", notes = "修改")
+ public ResponseEntity<ReturnDataDTO> update(@PathVariable Integer id,@Validated @RequestBody UpdateConfigParamDTO dto) {
+ return returnData(R.SUCCESS.getCode(), null);
+ }
+
+ @PutMapping("/update/batch")
+ @ApiOperation(value = "批量修改", notes = "批量修改")
+ public ResponseEntity<ReturnDataDTO> updateBath(@Validated @RequestBody UpdateConfigParamDTO dto) {
+ configParamService.updateConfigParamBatch(dto);
+ return returnData(R.SUCCESS.getCode(), null);
+ }
+
+ @DeleteMapping("/{id}")
+ @ApiOperation(value = "删除", notes = "删除")
+ public ResponseEntity<ReturnDataDTO> delete(Integer id) {
+ return returnData(R.SUCCESS.getCode(), null);
+ }
+
+ @GetMapping("/{id}")
+ @ApiOperation(value = "详情", notes = "详情")
+ public ResponseEntity<ReturnDataDTO> get(@PathVariable(value = "id") @Positive(message = "{id.positive}") Integer id) {
+ return returnData(R.SUCCESS.getCode(), null);
+ }
+
+
+ @GetMapping("/page")
+ @ApiOperation(value = "查询-分页", notes = "查询-分页")
+ public ResponseEntity<ReturnDataDTO<Page<ConfigParamVO>>> page(Page page, QueryConfigParamDTO dto) {
+ // 设置只查询活动优惠券的
+ return returnData(R.SUCCESS.getCode(), null);
+ }
+
+
+ @GetMapping("/list")
+ @ApiOperation(value = "查询-列表", notes = "查询-列表")
+ public ResponseEntity<ReturnDataDTO<Page<ConfigParamVO>>> list(QueryConfigParamDTO dto) {
+ // 设置只查询活动优惠券的
+ return returnData(R.SUCCESS.getCode(), configParamService.getList(dto));
+ }
+
+
+ @GetMapping("/base/info")
+ @ApiOperation(value = "查询-备案信息", notes = "查询-备案信息" )
+ public ResponseEntity<ReturnDataDTO<Map<String,Object>>> getBaseInfo() {
+ // 设置只查询活动优惠券的
+ return returnData(R.SUCCESS.getCode(), configParamService.getBaseInfo());
+ }
+
+
+
+}
diff --git a/src/main/java/com/mzl/flower/web/v2/configParam/ConfigParamGroupController.java b/src/main/java/com/mzl/flower/web/v2/configParam/ConfigParamGroupController.java
new file mode 100644
index 0000000..92ed052
--- /dev/null
+++ b/src/main/java/com/mzl/flower/web/v2/configParam/ConfigParamGroupController.java
@@ -0,0 +1,74 @@
+package com.mzl.flower.web.v2.configParam;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mzl.flower.base.BaseController;
+import com.mzl.flower.base.R;
+import com.mzl.flower.base.ReturnDataDTO;
+import com.mzl.flower.dto.request.configParam.CreateConfigParamGroupDTO;
+import com.mzl.flower.dto.request.configParam.QueryConfigParamDTO;
+import com.mzl.flower.dto.response.configParam.ConfigParamVO;
+import com.mzl.flower.service.ConfigParamGroupService;
+import com.mzl.flower.service.ConfigParamService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.Positive;
+
+/**
+* @author @TaoJie
+* @since 2024-12-02
+*/
+@RestController
+@RequestMapping("/v2/config-param-group")
+@Api(value = "系统配置-分组", tags = "系统配置-分组")
+public class ConfigParamGroupController extends BaseController {
+
+ @Autowired
+ private ConfigParamGroupService configParamGroupService;
+
+ @PostMapping("")
+ @ApiOperation(value = "新增", notes = "新增")
+ public ResponseEntity<ReturnDataDTO> create(@Validated @RequestBody CreateConfigParamGroupDTO dto) {
+ return returnData(R.SUCCESS.getCode(), null);
+ }
+
+ @PutMapping("/{id}")
+ @ApiOperation(value = "修改", notes = "修改")
+ public ResponseEntity<ReturnDataDTO> update(@PathVariable Integer id,@Validated @RequestBody CreateConfigParamGroupDTO dto) {
+ return returnData(R.SUCCESS.getCode(), null);
+ }
+
+ @DeleteMapping("/{id}")
+ @ApiOperation(value = "删除", notes = "删除")
+ public ResponseEntity<ReturnDataDTO> delete(Integer id) {
+ return returnData(R.SUCCESS.getCode(), null);
+ }
+
+ @GetMapping("/{id}")
+ @ApiOperation(value = "详情", notes = "详情")
+ public ResponseEntity<ReturnDataDTO> get(@PathVariable(value = "id") @Positive(message = "{id.positive}") Integer id) {
+ return returnData(R.SUCCESS.getCode(), null);
+ }
+
+
+ @GetMapping("/page")
+ @ApiOperation(value = "查询-分页", notes = "查询-分页")
+ public ResponseEntity<ReturnDataDTO<Page<ConfigParamVO>>> page(Page page, QueryConfigParamDTO dto) {
+
+ return returnData(R.SUCCESS.getCode(), null);
+ }
+
+
+ @GetMapping("/list")
+ @ApiOperation(value = "查询-列表", notes = "查询-列表")
+ public ResponseEntity<ReturnDataDTO<Page<ConfigParamVO>>> list(QueryConfigParamDTO dto) {
+
+ return returnData(R.SUCCESS.getCode(), configParamGroupService.getList(dto));
+ }
+
+}
diff --git a/src/main/resources/mapper/configParam/ConfigParamGroupMapper.xml b/src/main/resources/mapper/configParam/ConfigParamGroupMapper.xml
new file mode 100644
index 0000000..714574e
--- /dev/null
+++ b/src/main/resources/mapper/configParam/ConfigParamGroupMapper.xml
@@ -0,0 +1,18 @@
+<?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="com.mzl.flower.mapper.configParam.ConfigParamGroupMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.mzl.flower.entity.configParam.ConfigParamGroupDO">
+ <id column="id" property="id" />
+ <result column="deleted" property="deleted" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="param_group" property="paramGroup" />
+ <result column="param_group_name" property="paramGroupName" />
+ <result column="param_order" property="paramOrder" />
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/configParam/ConfigParamGroupMapperCustom.xml b/src/main/resources/mapper/configParam/ConfigParamGroupMapperCustom.xml
new file mode 100644
index 0000000..5bf89d7
--- /dev/null
+++ b/src/main/resources/mapper/configParam/ConfigParamGroupMapperCustom.xml
@@ -0,0 +1,18 @@
+<?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="com.mzl.flower.mapper.configParam.ConfigParamGroupMapperCustom">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.mzl.flower.entity.configParam.ConfigParamGroupDO">
+ <id column="id" property="id" />
+ <result column="deleted" property="deleted" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="param_group" property="paramGroup" />
+ <result column="param_group_name" property="paramGroupName" />
+ <result column="param_order" property="paramOrder" />
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/configParam/ConfigParamMapper.xml b/src/main/resources/mapper/configParam/ConfigParamMapper.xml
new file mode 100644
index 0000000..cc560ae
--- /dev/null
+++ b/src/main/resources/mapper/configParam/ConfigParamMapper.xml
@@ -0,0 +1,30 @@
+<?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="com.mzl.flower.mapper.configParam.ConfigParamMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.mzl.flower.entity.configParam.ConfigParamDO">
+ <id column="id" property="id" />
+ <result column="deleted" property="deleted" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="param_group_id" property="paramGroupId" />
+ <result column="param_group" property="paramGroup" />
+ <result column="param_group_name" property="paramGroupName" />
+ <result column="param_name" property="paramName" />
+ <result column="param_key" property="paramKey" />
+ <result column="param_value" property="paramValue" />
+ <result column="param_placeholder" property="paramPlaceholder" />
+ <result column="param_tip" property="paramTip" />
+ <result column="param_order" property="paramOrder" />
+ <result column="param_value_type" property="paramValueType" />
+ <result column="param_dict" property="paramDict" />
+
+ <result column="param_control_type" property="paramControlType" />
+ <result column="param_require" property="paramRequire" />
+ <result column="param_limit" property="paramLimit" />
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/configParam/ConfigParamMapperCustom.xml b/src/main/resources/mapper/configParam/ConfigParamMapperCustom.xml
new file mode 100644
index 0000000..ab5ea17
--- /dev/null
+++ b/src/main/resources/mapper/configParam/ConfigParamMapperCustom.xml
@@ -0,0 +1,26 @@
+<?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="com.mzl.flower.mapper.configParam.ConfigParamMapperCustom">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.mzl.flower.entity.configParam.ConfigParamDO">
+ <id column="id" property="id" />
+ <result column="deleted" property="deleted" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="param_group_id" property="paramGroupId" />
+ <result column="param_group" property="paramGroup" />
+ <result column="param_group_name" property="paramGroupName" />
+ <result column="param_name" property="paramName" />
+ <result column="param_key" property="paramKey" />
+ <result column="param_value" property="paramValue" />
+ <result column="param_placeholder" property="paramPlaceholder" />
+ <result column="param_tip" property="paramTip" />
+ <result column="param_order" property="paramOrder" />
+ <result column="param_value_type" property="paramValueType" />
+ <result column="param_dict" property="paramDict" />
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/flower/FlowerMapper.xml b/src/main/resources/mapper/flower/FlowerMapper.xml
index 711835b..e90238f 100644
--- a/src/main/resources/mapper/flower/FlowerMapper.xml
+++ b/src/main/resources/mapper/flower/FlowerMapper.xml
@@ -415,7 +415,7 @@
<update id="updateFlowerCategoryInfo">
update t_flower f, t_flower_category fc
- set f.unit = fc.unit, f.color = fc.color
+ set f.unit = fc.unit, f.color = fc.color,f.name=fc.name
where f.category = fc.id and fc.id = #{category}
</update>
<update id="updateBatchTypeRank">
--
Gitblit v1.9.3