解决方案重构

computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/solution/SolutionController.java

+package com.luhu.computility.module.biz.controller.admin.solution;
+
+import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.security.access.prepost.PreAuthorize;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Operation;
+
+import javax.validation.constraints.*;
+import javax.validation.*;
+import javax.servlet.http.*;
+import java.util.*;
+import java.io.IOException;
+
+import com.luhu.computility.framework.common.pojo.PageParam;
+import com.luhu.computility.framework.common.pojo.PageResult;
+import com.luhu.computility.framework.common.pojo.CommonResult;
+import com.luhu.computility.framework.common.util.object.BeanUtils;
+import static com.luhu.computility.framework.common.pojo.CommonResult.success;
+
+import com.luhu.computility.framework.excel.core.util.ExcelUtils;
+
+import com.luhu.computility.framework.apilog.core.annotation.ApiAccessLog;
+import static com.luhu.computility.framework.apilog.core.enums.OperateTypeEnum.*;
+
+import com.luhu.computility.module.biz.controller.admin.solution.vo.*;
+import com.luhu.computility.module.biz.dal.dataobject.solution.SolutionDO;
+import com.luhu.computility.module.biz.service.solution.SolutionService;
+
+@Tag(name = "管理后台 - 解决方案")
+@RestController
+@RequestMapping("/biz/solution")
+@Validated
+public class SolutionController {
+
+    @Resource
+    private SolutionService solutionService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建解决方案")
+    @PreAuthorize("@ss.hasPermission('biz:solution:create')")
+    public CommonResult<Long> createSolution(@Valid @RequestBody SolutionSaveReqVO createReqVO) {
+        return success(solutionService.createSolution(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新解决方案")
+    @PreAuthorize("@ss.hasPermission('biz:solution:update')")
+    public CommonResult<Boolean> updateSolution(@Valid @RequestBody SolutionSaveReqVO updateReqVO) {
+        solutionService.updateSolution(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除解决方案")
+    @Parameter(name = "id", description = "编号", required = true)
+    @PreAuthorize("@ss.hasPermission('biz:solution:delete')")
+    public CommonResult<Boolean> deleteSolution(@RequestParam("id") Long id) {
+        solutionService.deleteSolution(id);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete-list")
+    @Parameter(name = "ids", description = "编号", required = true)
+    @Operation(summary = "批量删除解决方案")
+                @PreAuthorize("@ss.hasPermission('biz:solution:delete')")
+    public CommonResult<Boolean> deleteSolutionList(@RequestParam("ids") List<Long> ids) {
+        solutionService.deleteSolutionListByIds(ids);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得解决方案")
+    @Parameter(name = "id", description = "编号", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('biz:solution:query')")
+    public CommonResult<SolutionRespVO> getSolution(@RequestParam("id") Long id) {
+        SolutionDO solution = solutionService.getSolution(id);
+        return success(BeanUtils.toBean(solution, SolutionRespVO.class));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得解决方案分页")
+    @PreAuthorize("@ss.hasPermission('biz:solution:query')")
+    public CommonResult<PageResult<SolutionRespVO>> getSolutionPage(@Valid SolutionPageReqVO pageReqVO) {
+        PageResult<SolutionDO> pageResult = solutionService.getSolutionPage(pageReqVO);
+        return success(BeanUtils.toBean(pageResult, SolutionRespVO.class));
+    }
+
+    @GetMapping("/export-excel")
+    @Operation(summary = "导出解决方案 Excel")
+    @PreAuthorize("@ss.hasPermission('biz:solution:export')")
+    @ApiAccessLog(operateType = EXPORT)
+    public void exportSolutionExcel(@Valid SolutionPageReqVO pageReqVO,
+              HttpServletResponse response) throws IOException {
+        pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
+        List<SolutionDO> list = solutionService.getSolutionPage(pageReqVO).getList();
+        // 导出 Excel
+        ExcelUtils.write(response, "解决方案.xls", "数据", SolutionRespVO.class,
+                        BeanUtils.toBean(list, SolutionRespVO.class));
+    }
+
+}
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/solution/vo/SolutionMenuRespVO.java

+package com.luhu.computility.module.biz.controller.admin.solution.vo;
+
+import lombok.Data;
+
+/**
+ * @Author: jony
+ * @Date : 2025/8/13 08:43
+ * @VERSION v1.0
+ */
+
+@Data
+public class SolutionMenuRespVO {
+    /**
+     * 主键
+     */
+    private Long id;
+    /**
+     * 方案类别
+     */
+    private Integer category;
+    /**
+     * 行业类别
+     */
+    private Integer industryCategory;
+    /**
+     * 标题(行业)
+     */
+    private String titleIndustry;
+}

computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/solution/vo/SolutionPageReqVO.java

+package com.luhu.computility.module.biz.controller.admin.solution.vo;
+
+import lombok.*;
+import java.util.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.luhu.computility.framework.common.pojo.PageParam;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+
+import static com.luhu.computility.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 解决方案分页 Request VO")
+@Data
+public class SolutionPageReqVO extends PageParam {
+
+    @Schema(description = "方案类别")
+    private Integer category;
+
+    @Schema(description = "行业类别")
+    private Integer industryCategory;
+
+    @Schema(description = "标题(行业)")
+    private String titleIndustry;
+
+    @Schema(description = "标题(解决方案)")
+    private String titleSolution;
+
+    @Schema(description = "标题(咨询)")
+    private String titleConsult;
+
+    @Schema(description = "行业概述")
+    private String industryInfo;
+
+    @Schema(description = "解决方案")
+    private String solutionInfo;
+
+    @Schema(description = "咨询流程")
+    private String consultInfo;
+
+    @Schema(description = "状态：0-已下架，1-已上架", example = "2")
+    private Integer groundingStatus;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+    @Schema(description = "创建者")
+    private String creator;
+
+    @Schema(description = "更新者")
+    private String updater;
+
+    @Schema(description = "备注", example = "随便")
+    private String remark;
+
+
+}
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/solution/vo/SolutionRespVO.java

+package com.luhu.computility.module.biz.controller.admin.solution.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import org.springframework.format.annotation.DateTimeFormat;
+import java.time.LocalDateTime;
+import com.alibaba.excel.annotation.*;
+
+@Schema(description = "管理后台 - 解决方案 Response VO")
+@Data
+@ExcelIgnoreUnannotated
+public class SolutionRespVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "21367")
+    @ExcelProperty("主键")
+    private Long id;
+
+    @Schema(description = "方案类别", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("方案类别")
+    private Boolean category;
+
+    @Schema(description = "行业类别", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("行业类别")
+    private Boolean industryCategory;
+
+    @Schema(description = "标题(行业)", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("标题(行业)")
+    private String titleIndustry;
+
+    @Schema(description = "标题(解决方案)", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("标题(解决方案)")
+    private String titleSolution;
+
+    @Schema(description = "标题(咨询)", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("标题(咨询)")
+    private String titleConsult;
+
+    @Schema(description = "行业概述")
+    @ExcelProperty("行业概述")
+    private String industryInfo;
+
+    @Schema(description = "解决方案")
+    @ExcelProperty("解决方案")
+    private String solutionInfo;
+
+    @Schema(description = "咨询流程")
+    @ExcelProperty("咨询流程")
+    private String consultInfo;
+
+    @Schema(description = "状态：0-已下架，1-已上架", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @ExcelProperty("状态：0-已下架，1-已上架")
+    private Boolean groundingStatus;
+
+    @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "创建者")
+    @ExcelProperty("创建者")
+    private String createBy;
+
+    @Schema(description = "更新者")
+    @ExcelProperty("更新者")
+    private String updateBy;
+
+    @Schema(description = "备注", example = "随便")
+    @ExcelProperty("备注")
+    private String remark;
+
+    @Schema(description = "删除标志（0代表存在 2代表删除)")
+    @ExcelProperty("删除标志（0代表存在 2代表删除)")
+    private String delFlag;
+
+}
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/controller/admin/solution/vo/SolutionSaveReqVO.java

+package com.luhu.computility.module.biz.controller.admin.solution.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.*;
+import java.util.*;
+import javax.validation.constraints.*;
+
+@Schema(description = "管理后台 - 解决方案新增/修改 Request VO")
+@Data
+public class SolutionSaveReqVO {
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "21367")
+    private Long id;
+
+    @Schema(description = "方案类别", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "方案类别不能为空")
+    private Boolean category;
+
+    @Schema(description = "行业类别", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotNull(message = "行业类别不能为空")
+    private Boolean industryCategory;
+
+    @Schema(description = "标题(行业)", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "标题(行业)不能为空")
+    private String titleIndustry;
+
+    @Schema(description = "标题(解决方案)", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "标题(解决方案)不能为空")
+    private String titleSolution;
+
+    @Schema(description = "标题(咨询)", requiredMode = Schema.RequiredMode.REQUIRED)
+    @NotEmpty(message = "标题(咨询)不能为空")
+    private String titleConsult;
+
+    @Schema(description = "行业概述")
+    private String industryInfo;
+
+    @Schema(description = "解决方案")
+    private String solutionInfo;
+
+    @Schema(description = "咨询流程")
+    private String consultInfo;
+
+    @Schema(description = "状态：0-已下架，1-已上架", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
+    @NotNull(message = "状态：0-已下架，1-已上架不能为空")
+    private Boolean groundingStatus;
+
+    @Schema(description = "创建者")
+    private String createBy;
+
+    @Schema(description = "更新者")
+    private String updateBy;
+
+    @Schema(description = "备注", example = "随便")
+    private String remark;
+
+    @Schema(description = "删除标志（0代表存在 2代表删除)")
+    private String delFlag;
+
+}
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/dal/dataobject/solution/SolutionDO.java

+package com.luhu.computility.module.biz.dal.dataobject.solution;
+
+import lombok.*;
+import java.util.*;
+import java.time.LocalDateTime;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.*;
+import com.luhu.computility.framework.mybatis.core.dataobject.BaseDO;
+
+/**
+ * 解决方案 DO
+ *
+ * @author 测试号02
+ */
+@TableName("biz_solution")
+@KeySequence("biz_solution_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SolutionDO extends BaseDO {
+
+    /**
+     * 主键
+     */
+    @TableId
+    private Long id;
+    /**
+     * 方案类别
+     */
+    private Integer category;
+    /**
+     * 行业类别
+     */
+    private Integer industryCategory;
+    /**
+     * 标题(行业)
+     */
+    private String titleIndustry;
+    /**
+     * 标题(解决方案)
+     */
+    private String titleSolution;
+    /**
+     * 标题(咨询)
+     */
+    private String titleConsult;
+    /**
+     * 行业概述
+     */
+    private String industryInfo;
+    /**
+     * 解决方案
+     */
+    private String solutionInfo;
+    /**
+     * 咨询流程
+     */
+    private String consultInfo;
+    /**
+     * 状态：0-已下架，1-已上架
+     */
+    private Integer groundingStatus;
+    /**
+     * 创建者
+     */
+    private String creator;
+    /**
+     * 更新者
+     */
+    private String updater;
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/dal/mysql/solution/SolutionMapper.java

+package com.luhu.computility.module.biz.dal.mysql.solution;
+
+import java.util.*;
+
+import com.luhu.computility.framework.common.pojo.PageResult;
+import com.luhu.computility.framework.mybatis.core.query.LambdaQueryWrapperX;
+import com.luhu.computility.framework.mybatis.core.mapper.BaseMapperX;
+import com.luhu.computility.module.biz.dal.dataobject.solution.SolutionDO;
+import org.apache.ibatis.annotations.Mapper;
+import com.luhu.computility.module.biz.controller.admin.solution.vo.*;
+
+/**
+ * 解决方案 Mapper
+ *
+ * @author 测试号02
+ */
+@Mapper
+public interface SolutionMapper extends BaseMapperX<SolutionDO> {
+
+    default PageResult<SolutionDO> selectPage(SolutionPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<SolutionDO>()
+                .eqIfPresent(SolutionDO::getCategory, reqVO.getCategory())
+                .eqIfPresent(SolutionDO::getIndustryCategory, reqVO.getIndustryCategory())
+                .eqIfPresent(SolutionDO::getTitleIndustry, reqVO.getTitleIndustry())
+                .eqIfPresent(SolutionDO::getTitleSolution, reqVO.getTitleSolution())
+                .eqIfPresent(SolutionDO::getTitleConsult, reqVO.getTitleConsult())
+                .eqIfPresent(SolutionDO::getIndustryInfo, reqVO.getIndustryInfo())
+                .eqIfPresent(SolutionDO::getSolutionInfo, reqVO.getSolutionInfo())
+                .eqIfPresent(SolutionDO::getConsultInfo, reqVO.getConsultInfo())
+                .eqIfPresent(SolutionDO::getGroundingStatus, reqVO.getGroundingStatus())
+                .betweenIfPresent(SolutionDO::getCreateTime, reqVO.getCreateTime())
+                .eqIfPresent(SolutionDO::getCreator, reqVO.getCreator())
+                .eqIfPresent(SolutionDO::getUpdater, reqVO.getUpdater())
+                .eqIfPresent(SolutionDO::getRemark, reqVO.getRemark())
+                .orderByDesc(SolutionDO::getId));
+    }
+
+
+}
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/enums/ErrorCodeConstants.java

@@ -22,4 +22,5 @@ public interface ErrorCodeConstants {
 
     ErrorCode PARTNER_NOT_EXISTS = new ErrorCode(1_040_016_000, "合作伙伴管理不存在");
 
+    ErrorCode SOLUTION_NOT_EXISTS = new ErrorCode(1_040_017_000, "解决方案不存在");
 }

computility-module-biz/src/main/java/com/luhu/computility/module/biz/service/order/OrderServiceImpl.java

@@ -50,7 +50,7 @@ public class OrderServiceImpl implements OrderService {
         orderSaveReqVO.setCpu(resourcesDetailRespVO.getCpuId());
         orderSaveReqVO.setMemory(resourcesDetailRespVO.getMemoryId());
         orderSaveReqVO.setStorage(resourcesDetailRespVO.getStorageId());
-
+//        orderSaveReqVO.
 
     }
 

computility-module-biz/src/main/java/com/luhu/computility/module/biz/service/solution/SolutionService.java

+package com.luhu.computility.module.biz.service.solution;
+
+import java.util.*;
+import javax.validation.*;
+import com.luhu.computility.module.biz.controller.admin.solution.vo.*;
+import com.luhu.computility.module.biz.dal.dataobject.solution.SolutionDO;
+import com.luhu.computility.framework.common.pojo.PageResult;
+import com.luhu.computility.framework.common.pojo.PageParam;
+
+/**
+ * 解决方案 Service 接口
+ *
+ * @author 测试号02
+ */
+public interface SolutionService {
+
+    /**
+     * 创建解决方案
+     *
+     * @param createReqVO 创建信息
+     * @return 编号
+     */
+    Long createSolution(@Valid SolutionSaveReqVO createReqVO);
+
+    /**
+     * 更新解决方案
+     *
+     * @param updateReqVO 更新信息
+     */
+    void updateSolution(@Valid SolutionSaveReqVO updateReqVO);
+
+    /**
+     * 删除解决方案
+     *
+     * @param id 编号
+     */
+    void deleteSolution(Long id);
+
+    /**
+    * 批量删除解决方案
+    *
+    * @param ids 编号
+    */
+    void deleteSolutionListByIds(List<Long> ids);
+
+    /**
+     * 获得解决方案
+     *
+     * @param id 编号
+     * @return 解决方案
+     */
+    SolutionDO getSolution(Long id);
+
+    /**
+     * 获得解决方案分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 解决方案分页
+     */
+    PageResult<SolutionDO> getSolutionPage(SolutionPageReqVO pageReqVO);
+
+
+    List<SolutionDO> selectSolutionList(SolutionPageReqVO pageReqVO);
+}
\ No newline at end of file

computility-module-biz/src/main/java/com/luhu/computility/module/biz/service/solution/SolutionServiceImpl.java

+package com.luhu.computility.module.biz.service.solution;
+
+import cn.hutool.core.collection.CollUtil;
+import com.luhu.computility.framework.mybatis.core.query.LambdaQueryWrapperX;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+import org.springframework.validation.annotation.Validated;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+
+import com.luhu.computility.module.biz.controller.admin.solution.vo.*;
+import com.luhu.computility.module.biz.dal.dataobject.solution.SolutionDO;
+import com.luhu.computility.framework.common.pojo.PageResult;
+import com.luhu.computility.framework.common.pojo.PageParam;
+import com.luhu.computility.framework.common.util.object.BeanUtils;
+
+import com.luhu.computility.module.biz.dal.mysql.solution.SolutionMapper;
+
+import static com.luhu.computility.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.luhu.computility.framework.common.util.collection.CollectionUtils.convertList;
+import static com.luhu.computility.framework.common.util.collection.CollectionUtils.diffList;
+import static com.luhu.computility.module.biz.enums.ErrorCodeConstants.*;
+
+/**
+ * 解决方案 Service 实现类
+ *
+ * @author 测试号02
+ */
+@Service
+@Validated
+public class SolutionServiceImpl implements SolutionService {
+
+    @Resource
+    private SolutionMapper solutionMapper;
+
+    @Override
+    public Long createSolution(SolutionSaveReqVO createReqVO) {
+        // 插入
+        SolutionDO solution = BeanUtils.toBean(createReqVO, SolutionDO.class);
+        solutionMapper.insert(solution);
+
+        // 返回
+        return solution.getId();
+    }
+
+    @Override
+    public void updateSolution(SolutionSaveReqVO updateReqVO) {
+        // 校验存在
+        validateSolutionExists(updateReqVO.getId());
+        // 更新
+        SolutionDO updateObj = BeanUtils.toBean(updateReqVO, SolutionDO.class);
+        solutionMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteSolution(Long id) {
+        // 校验存在
+        validateSolutionExists(id);
+        // 删除
+        solutionMapper.deleteById(id);
+    }
+
+    @Override
+    public void deleteSolutionListByIds(List<Long> ids) {
+        // 删除
+        solutionMapper.deleteByIds(ids);
+    }
+
+
+    private void validateSolutionExists(Long id) {
+        if (solutionMapper.selectById(id) == null) {
+            throw exception(SOLUTION_NOT_EXISTS);
+        }
+    }
+
+    @Override
+    public SolutionDO getSolution(Long id) {
+        return solutionMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<SolutionDO> getSolutionPage(SolutionPageReqVO pageReqVO) {
+        return solutionMapper.selectPage(pageReqVO);
+    }
+
+    @Override
+    public List<SolutionDO> selectSolutionList(SolutionPageReqVO reqVO) {
+        LambdaQueryWrapperX<SolutionDO> wrapper = new LambdaQueryWrapperX<SolutionDO>()
+                .eqIfPresent(SolutionDO::getGroundingStatus, reqVO.getGroundingStatus())
+                .orderByDesc(SolutionDO::getId);
+        List<SolutionDO> result = solutionMapper.selectList(wrapper);
+        return result;
+    }
+
+
+}
\ No newline at end of file

computility-module-biz/src/main/resources/mapper/solution/SolutionMapper.xml

+<?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.luhu.computility.module.biz.dal.mysql.solution.SolutionMapper">
+
+    <!--
+        一般情况下，尽可能使用 Mapper 进行 CRUD 增删改查即可。
+        无法满足的场景，例如说多表关联查询，才使用 XML 编写 SQL。
+        代码生成器暂时只生成 Mapper XML 文件本身，更多推荐 MybatisX 快速开发插件来生成查询。
+        文档可见：https://www.iocoder.cn/MyBatis/x-plugins/
+     -->
+
+</mapper>
\ No newline at end of file

computility-module-mall/computility-module-trade/src/main/java/com/luhu/computility/module/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -164,7 +164,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
      * @return 订单价格
      */
     private TradePriceCalculateRespBO calculatePrice(Long userId, AppTradeOrderSettlementReqVO settlementReqVO) {
-        // 1. 如果来自购物车，则获得购物车的商品
+        // 1. 如果来自购物车，则获得购物车的商品，cartId为空则立即购买
         List<CartDO> cartList = cartService.getCartList(userId,
                 convertSet(settlementReqVO.getItems(), AppTradeOrderSettlementReqVO.Item::getCartId));
 

computility-module-system/src/main/java/com/luhu/computility/module/system/util/dict/DictUtils.java

@@ -2,6 +2,7 @@ package com.luhu.computility.module.system.util.dict;
 
 
 import cn.hutool.core.util.ObjectUtil;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson2.JSONArray;
 import com.luhu.computility.framework.common.core.redis.RedisCache;
 import com.luhu.computility.framework.common.util.spring.SpringUtils;
@@ -42,27 +43,22 @@ public class DictUtils {
      * @return dictDatas 字典数据列表
      */
     public static List<DictDataDO> getDictCache(String key) {
-//        JSONArray arrayCache = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
-//        if (ObjectUtil.isNotNull(arrayCache)) {
-//            return arrayCache.toJavaList(DictDataDO.class);
-//        }
-//        return null;
         Object cacheObj = SpringUtils.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
         if (cacheObj == null) {
             return null;
         }
 
-        List<DictDataDO> dictList;
-        if (cacheObj instanceof JSONArray) {
-            // 新数据：JSONArray 直接转 List
-            dictList = ((JSONArray) cacheObj).toJavaList(DictDataDO.class);
-        } else if (cacheObj instanceof ArrayList) {
-            dictList = (List<DictDataDO>) cacheObj;
+        // 统一将缓存对象转为 JSON 字符串，再解析为 List<DictDataDO>
+        String jsonStr;
+        if (cacheObj instanceof String) {
+            jsonStr = (String) cacheObj;
         } else {
-            // 其他未知类型，返回空列表（避免报错）
-            dictList = new ArrayList<>();
+            // 如果是对象/列表，先转为 JSON 字符串
+            jsonStr = JSON.toJSONString(cacheObj);
         }
-        return dictList;
+
+        // 解析 JSON 字符串为 List<DictDataDO>
+        return JSON.parseArray(jsonStr, DictDataDO.class);
     }
 
     /**

computility-server/src/main/resources/logback-spring.xml

@@ -56,6 +56,11 @@
         </encoder>
     </appender>
 
+    <logger name="com.luhu.computility.module" level="DEBUG" additivity="false">
+        <appender-ref ref="STDOUT" />
+        <appender-ref ref="GRPC" />
+    </logger>
+
     <!-- 本地环境 -->
     <springProfile name="local">
         <root level="INFO">