维多利亚

hx-common/code-generator/src/main/java/com/fjhx/modular/Victoriatourist.java

@@ -12,7 +12,7 @@ public class Victoriatourist {
         CodeGenerator.MODULAR_NAME = "victoriatourist";
 
         // 需要生成的表名称,多表用,隔开
-        CodeGenerator.INCLUDE = "product_tag";
+        CodeGenerator.INCLUDE = "jd_back_details";
 
         // mysql连接
         CodeGenerator.MYSQL_URL = "36.134.91.96:17330";

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/jd/JdBack.java

@@ -0,0 +1,49 @@
+package com.fjhx.entity.jd;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.Version;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fjhx.base.BaseEntity;
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 京东退货
+ * </p>
+ *
+ * @author ${author}
+ * @since 2023-02-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class JdBack extends BaseEntity {
+
+
+    /**
+     * 运单号
+     */
+    private String waybill;
+
+    /**
+     * 仓库id
+     */
+    private Long warehouseId;
+
+    /**
+     * 批次标记
+     */
+    private Long batchFlag;
+
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/entity/jd/JdBackDetails.java

@@ -0,0 +1,102 @@
+package com.fjhx.entity.jd;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.fjhx.base.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 京东退货明细
+ * </p>
+ *
+ * @author ${author}
+ * @since 2023-02-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ExcelIgnoreUnannotated
+public class JdBackDetails extends BaseEntity {
+
+
+    /**
+     * 京东退货id
+     */
+    private Long jdBackId;
+
+    /**
+     * 退货单号
+     */
+    @ExcelProperty("退货单号")
+    private String backCode;
+
+    /**
+     * 申请时间
+     */
+    @ExcelProperty("申请时间")
+
+    private Date applicationTime;
+
+    /**
+     * 备件条码
+     */
+    @ExcelProperty("备件条码")
+    private String spareParts;
+
+    /**
+     * upc码
+     */
+    @ExcelProperty("UPC码")
+    private String upcCode;
+
+    /**
+     * 商品编号\产品code
+     */
+    @ExcelProperty("商品编号")
+    private Long productCode;
+
+    /**
+     * 商品名称
+     */
+    @ExcelProperty("商品名称")
+    private String productName;
+
+    /**
+     * 备件库
+     */
+    @ExcelProperty("备件库")
+    private String sparePartsStore;
+
+    /**
+     * 运单号
+     */
+    @ExcelProperty("运单号")
+    private String waybill;
+
+    /**
+     * 确认到货时间
+     */
+    @ExcelProperty("确认收货时间")
+    private Date arrivalTime;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty("备注")
+    private String remark;
+
+    /**
+     * 逻辑删除 0未删除 1已删除
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @TableLogic
+    private Integer delFlag;
+
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/jd/JdBackDetailsEx.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.jd;
+
+import com.fjhx.entity.jd.JdBackDetails;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 京东退货明细
+ *
+ * @author ${author}
+ * @since 2023-02-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class JdBackDetailsEx extends JdBackDetails {
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/jd/JdBackDetailsVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.jd;
+
+import com.fjhx.entity.jd.JdBackDetails;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 京东退货明细
+ *
+ * @author ${author}
+ * @since 2023-02-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class JdBackDetailsVo extends JdBackDetails {
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/jd/JdBackEx.java

@@ -0,0 +1,22 @@
+package com.fjhx.params.jd;
+
+import com.fjhx.entity.jd.JdBack;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 京东退货
+ *
+ * @author ${author}
+ * @since 2023-02-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class JdBackEx extends JdBack {
+
+    /**
+     * 仓库名称
+     */
+    private String warehouseName;
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/jd/JdBackPageDto.java

@@ -0,0 +1,21 @@
+package com.fjhx.params.jd;
+
+import com.fjhx.base.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class JdBackPageDto extends BaseSelectDto {
+
+    /**
+     * 运单号
+     */
+    private String waybill;
+
+    /**
+     * 仓库id
+     */
+    private Long warehouseId;
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/jd/JdBackVo.java

@@ -0,0 +1,17 @@
+package com.fjhx.params.jd;
+
+import com.fjhx.entity.jd.JdBack;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 京东退货
+ *
+ * @author ${author}
+ * @since 2023-02-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class JdBackVo extends JdBack {
+
+}

hx-service-api/victoriatourist-api/src/main/java/com/fjhx/params/logistics/JdBackPageDto.java

@@ -8,6 +8,9 @@ import lombok.Setter;
 @Setter
 public class JdBackPageDto extends BaseSelectDto {
 
-
+    /**
+     * 京东退货状态 1新建 2运输中 3待质检 4已完成
+     */
+    private Integer jdBackStatus;
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/controller/jd/NewJdBackController.java

@@ -0,0 +1,55 @@
+package com.fjhx.controller.jd;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.base.BaseSelectDto;
+import com.fjhx.entity.jd.JdBackDetails;
+import com.fjhx.params.jd.JdBackEx;
+import com.fjhx.params.jd.JdBackPageDto;
+import com.fjhx.service.jd.JdBackDetailsService;
+import com.fjhx.service.jd.JdBackService;
+import org.springblade.core.tool.api.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 京东退货 前端控制器
+ * </p>
+ *
+ * @author ${author}
+ * @since 2023-02-23
+ */
+@RestController
+@RequestMapping("/newJdBack")
+public class NewJdBackController {
+
+    @Autowired
+    private JdBackService jdBackService;
+
+    @Autowired
+    private JdBackDetailsService jdBackDetailsService;
+
+    @PostMapping("/excelImport")
+    public R excelImport(@RequestParam("file") MultipartFile file, @RequestParam("warehouseId") Long warehouseId) {
+        jdBackService.excelImport(file, warehouseId);
+        return R.success();
+    }
+
+    @PostMapping("/page")
+    public R page(@RequestBody JdBackPageDto dto) {
+        Page<JdBackEx> page = jdBackService.getPage(dto);
+        return R.success(page);
+    }
+
+    @PostMapping("/details")
+    public R details(@RequestBody BaseSelectDto dto) {
+        List<JdBackDetails> list = jdBackDetailsService.list(q -> q.eq(JdBackDetails::getJdBackId, dto.getId()));
+        return R.success(list);
+    }
+
+
+}
+

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/jd/JdBackDetailsMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.mapper.jd;
+
+import com.fjhx.entity.jd.JdBackDetails;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 京东退货明细 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2023-02-23
+ */
+public interface JdBackDetailsMapper extends BaseMapper<JdBackDetails> {
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/jd/JdBackDetailsMapper.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="com.fjhx.mapper.jd.JdBackDetailsMapper">
+
+</mapper>

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/jd/JdBackMapper.java

@@ -0,0 +1,16 @@
+package com.fjhx.mapper.jd;
+
+import com.fjhx.entity.jd.JdBack;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 京东退货 Mapper 接口
+ * </p>
+ *
+ * @author ${author}
+ * @since 2023-02-23
+ */
+public interface JdBackMapper extends BaseMapper<JdBack> {
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/mapper/jd/JdBackMapper.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="com.fjhx.mapper.jd.JdBackMapper">
+
+</mapper>

hx-service/victoriatourist/src/main/java/com/fjhx/service/jd/JdBackDetailsService.java

@@ -0,0 +1,28 @@
+package com.fjhx.service.jd;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.jd.JdBackDetails;
+import com.fjhx.params.jd.JdBackDetailsVo;
+import com.fjhx.base.BaseService;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 京东退货明细 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2023-02-23
+ */
+public interface JdBackDetailsService extends BaseService<JdBackDetails> {
+
+    Page<JdBackDetails> getPage(Map<String, Object> condition);
+
+    void add(JdBackDetailsVo jdBackDetailsVo);
+
+    void edit(JdBackDetailsVo jdBackDetailsVo);
+
+    void delete(JdBackDetailsVo jdBackDetailsVo);
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/service/jd/JdBackService.java

@@ -0,0 +1,38 @@
+package com.fjhx.service.jd;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.base.BaseService;
+import com.fjhx.entity.jd.JdBack;
+import com.fjhx.params.jd.JdBackEx;
+import com.fjhx.params.jd.JdBackPageDto;
+import com.fjhx.params.jd.JdBackVo;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * <p>
+ * 京东退货 服务类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2023-02-23
+ */
+public interface JdBackService extends BaseService<JdBack> {
+
+
+    void add(JdBackVo jdBackVo);
+
+    void edit(JdBackVo jdBackVo);
+
+    void delete(JdBackVo jdBackVo);
+
+    /**
+     * 京东退货单导入
+     */
+    void excelImport(MultipartFile file, Long warehouseId);
+
+    /**
+     * 京东数据分页
+     */
+    Page<JdBackEx> getPage(JdBackPageDto dto);
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/service/jd/impl/JdBackDetailsServiceImpl.java

@@ -0,0 +1,48 @@
+package com.fjhx.service.jd.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.entity.jd.JdBackDetails;
+import com.fjhx.params.jd.JdBackDetailsVo;
+import com.fjhx.mapper.jd.JdBackDetailsMapper;
+import com.fjhx.service.jd.JdBackDetailsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.utils.wrapperUtil.IWrapper;
+import org.springframework.stereotype.Service;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 京东退货明细 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2023-02-23
+ */
+@Service
+public class JdBackDetailsServiceImpl extends ServiceImpl<JdBackDetailsMapper, JdBackDetails> implements JdBackDetailsService {
+
+    @Override
+    public Page<JdBackDetails> getPage(Map<String, Object> condition) {
+
+        IWrapper<JdBackDetails> wrapper = IWrapper.getWrapper(condition);
+
+        return page(condition, wrapper);
+    }
+
+    @Override
+    public void add(JdBackDetailsVo jdBackDetailsVo) {
+        save(jdBackDetailsVo);
+    }
+
+    @Override
+    public void edit(JdBackDetailsVo jdBackDetailsVo) {
+        updateById(jdBackDetailsVo);
+    }
+
+    @Override
+    public void delete(JdBackDetailsVo jdBackDetailsVo) {
+        removeById(jdBackDetailsVo.getId());
+    }
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/service/jd/impl/JdBackServiceImpl.java

@@ -0,0 +1,119 @@
+package com.fjhx.service.jd.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.base.BaseEntity;
+import com.fjhx.entity.jd.JdBack;
+import com.fjhx.entity.jd.JdBackDetails;
+import com.fjhx.mapper.jd.JdBackMapper;
+import com.fjhx.params.jd.JdBackEx;
+import com.fjhx.params.jd.JdBackPageDto;
+import com.fjhx.params.jd.JdBackVo;
+import com.fjhx.service.jd.JdBackDetailsService;
+import com.fjhx.service.jd.JdBackService;
+import com.fjhx.service.warehouse.WarehouseService;
+import com.fjhx.utils.PageUtil;
+import org.springblade.core.excel.util.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 京东退货 服务实现类
+ * </p>
+ *
+ * @author ${author}
+ * @since 2023-02-23
+ */
+@Service
+public class JdBackServiceImpl extends ServiceImpl<JdBackMapper, JdBack> implements JdBackService {
+
+    @Autowired
+    private JdBackDetailsService jdBackDetailsService;
+
+    @Autowired
+    private WarehouseService warehouseService;
+
+    @Override
+    public void add(JdBackVo jdBackVo) {
+        save(jdBackVo);
+    }
+
+    @Override
+    public void edit(JdBackVo jdBackVo) {
+        updateById(jdBackVo);
+    }
+
+    @Override
+    public void delete(JdBackVo jdBackVo) {
+        removeById(jdBackVo.getId());
+    }
+
+    @Transactional(rollbackFor = Exception.class)
+    @Override
+    public void excelImport(MultipartFile file, Long warehouseId) {
+        long batchFlag = IdWorker.getId();
+
+        // 读取excel数据
+        List<JdBackDetails> jdBackDetailsList = ExcelUtil.read(file, JdBackDetails.class);
+
+        // 按运单号分组
+        Map<String, List<JdBackDetails>> byWaybillMap = jdBackDetailsList.stream()
+                .collect(Collectors.groupingBy(JdBackDetails::getWaybill));
+
+        List<JdBack> jdBackList = new ArrayList<>();
+        byWaybillMap.forEach((k, v) -> {
+            Long id = IdWorker.getId();
+
+            JdBack jdBack = new JdBack();
+            jdBack.setId(id);
+            jdBack.setWaybill(k);
+            jdBack.setWarehouseId(warehouseId);
+            jdBack.setBatchFlag(batchFlag);
+            jdBackList.add(jdBack);
+
+            v.forEach(item -> item.setJdBackId(id));
+
+        });
+
+        saveBatch(jdBackList);
+        jdBackDetailsService.saveBatch(jdBackDetailsList);
+    }
+
+    @Override
+    public Page<JdBackEx> getPage(JdBackPageDto dto) {
+
+        LambdaQueryWrapper<JdBack> wrapper = Wrappers.<JdBack>lambdaQuery()
+                .like(ObjectUtil.isNotEmpty(dto.getWaybill()), JdBack::getWaybill, dto.getWaybill())
+                .like(ObjectUtil.isNotEmpty(dto.getWarehouseId()), JdBack::getWarehouseId, dto.getWarehouseId())
+                .between(ObjectUtil.isAllNotEmpty(dto.getBeginTime(), dto.getEndTime()),
+                        BaseEntity::getCreateTime, dto.getBeginTime(), dto.getEndTime());
+
+        Page<JdBack> page = page(dto.getPage(), wrapper);
+        Page<JdBackEx> jdBackExPage = PageUtil.copyPage(page, JdBackEx.class);
+
+        List<JdBackEx> records = jdBackExPage.getRecords();
+
+        if (records.size() == 0) {
+            return jdBackExPage;
+        }
+
+        warehouseService.attributeAssign(records, JdBack::getWarehouseId, (item, warehouse) -> {
+            item.setWarehouseName(warehouse.getName());
+        });
+
+        return jdBackExPage;
+    }
+
+}

hx-service/victoriatourist/src/main/java/com/fjhx/service/logistics/impl/LogisticsInfoServiceImpl.java

@@ -411,9 +411,9 @@ public class LogisticsInfoServiceImpl extends ServiceImpl<LogisticsInfoMapper, L
     @Override
     public Page<JdBackPageVo> jdBackPage(JdBackPageDto dto) {
         IWrapper<Object> wrapper = IWrapper.getWrapper(dto)
-                .keyword(new KeywordData("pi", ProductInfo::getName),
-                        new KeywordData("pi", ProductInfo::getCode),
-                        new KeywordData("li", LogisticsInfo::getJdBackOrderId));
+                .keyword(
+                        new KeywordData("li", LogisticsInfo::getJdBackOrderId))
+                .eq("li", LogisticsInfo::getJdBackStatus, dto.getJdBackStatus());
 
         return baseMapper.jdBackPage(dto.getPage(), wrapper);
     }
@@ -500,7 +500,7 @@ public class LogisticsInfoServiceImpl extends ServiceImpl<LogisticsInfoMapper, L
         Assert.notEmpty(logisticsDetailsList, "京东退货明细不能为空");
 
         LogisticsInfo logisticsInfo = getById(dto.getId());
-        Assert.eqTrue(ObjectUtil.isAllNotEmpty(logisticsInfo.getCode(), logisticsInfo.getLogisticsCompanyCode()), "退货已发起，无法编辑");
+        Assert.eqTrue(!ObjectUtil.isAllNotEmpty(logisticsInfo.getCode(), logisticsInfo.getLogisticsCompanyCode()), "退货已发起，无法编辑");
 
         String code = dto.getCode();
         String logisticsCompanyCode = dto.getLogisticsCompanyCode();
@@ -542,7 +542,7 @@ public class LogisticsInfoServiceImpl extends ServiceImpl<LogisticsInfoMapper, L
     @Override
     public void jdBackDelete(Long id) {
         LogisticsInfo logisticsInfo = getById(id);
-        Assert.eqTrue(ObjectUtil.isAllNotEmpty(logisticsInfo.getCode(), logisticsInfo.getLogisticsCompanyCode()), "退货已发起，无法删除");
+        Assert.eqTrue(!ObjectUtil.isAllNotEmpty(logisticsInfo.getCode(), logisticsInfo.getLogisticsCompanyCode()), "退货已发起，无法删除");
 
         removeById(id);
         logisticsDetailsService.remove(LogisticsDetails::getLogisticsInfoId, id);

hx-service/victoriatourist/src/main/java/com/fjhx/service/product/impl/ProductInfoServiceImpl.java

@@ -4,6 +4,8 @@ import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.base.BaseEntity;
+import com.fjhx.base.BaseIdEntity;
 import com.fjhx.base.Condition;
 import com.fjhx.constants.StatusConstant;
 import com.fjhx.entity.product.ProductCombination;
@@ -137,7 +139,7 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
 
             // 移交部门
             Dept transferDetp = deptMap.get(Convert.toLong(record.get("transferDetpId")));
-            if (ObjectUtil.isNotEmpty(transferDetp) && transferDetp.getPersonInChargeId().equals(AuthUtil.getUserId())) {
+            if (ObjectUtil.isNotEmpty(transferDetp) && Objects.equals(AuthUtil.getUserId(), transferDetp.getPersonInChargeId())) {
                 record.put("receiveDetp", transferDetp.getDeptName());
                 record.put("receiveFlag", true);
             }
@@ -255,9 +257,13 @@ public class ProductInfoServiceImpl extends ServiceImpl<ProductInfoMapper, Produ
         Long transferDetpId = productInfo.getTransferDetpId();
         Assert.notEmpty(transferDetpId, "没有发起移交请求或移交请求已被处理");
 
-        productInfo.setDeptId(transferDetpId);
-        productInfo.setTransferDetpId(null);
-        updateById(productInfo);
+        update(q -> q.eq(BaseIdEntity::getId, dto.getId())
+                .set(ProductInfo::getDeptId, transferDetpId)
+                .set(ProductInfo::getTransferDetpId, null)
+                .set(BaseEntity::getUpdateUser, AuthUtil.getUserId())
+                .set(BaseEntity::getUpdateTime, new Date())
+        );
+
     }
 
 }

hx-service/victoriatourist/src/main/java/com/fjhx/uitl/code/CodeEnum.java

@@ -2,6 +2,7 @@ package com.fjhx.uitl.code;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.text.CharSequenceUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -130,7 +131,7 @@ public enum CodeEnum {
 
         Map<String, Object> map = Convert.toMap(String.class, Object.class, obj);
 
-        String code = Convert.toStr(map.get(codeFieldName));
+        String code = Convert.toStr(map.get(CharSequenceUtil.toCamelCase(codeFieldName)));
         Integer codeNum = Convert.toInt(code.substring(itemPrefix.length()));
         Assert.notEmpty(codeNum, "自定义编码与系统编码生成规则冲突，暂时无法生成编码，请联系管理员");