feat:行政区划，物流费用

xkt/src/main/java/com/ruoyi/xkt/domain/ExpressFeeConfig.java

@@ -0,0 +1,42 @@
+package com.ruoyi.xkt.domain;
+
+import com.baomidou.mybatisplus.annotation.Version;
+import com.ruoyi.common.core.domain.SimpleEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+/**
+ * 物流费用配置
+ *
+ * @author liangyq
+ * @date 2025-04-02 14:54
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ExpressFeeConfig extends SimpleEntity {
+    /**
+     * 地区编码，基于行政区划代码做扩展，唯一约束
+     */
+    private String regionCode;
+    /**
+     * 上级地区编码，没有上级的默认空
+     */
+    private String parentRegionCode;
+    /**
+     * 首件运费
+     */
+    private BigDecimal firstItemAmount;
+    /**
+     * 续费
+     */
+    private BigDecimal nextItemAmount;
+    /**
+     * 版本号
+     */
+    @Version
+    private Long version;
+}

xkt/src/main/java/com/ruoyi/xkt/domain/ExpressRegion.java

@@ -0,0 +1,44 @@
+package com.ruoyi.xkt.domain;
+
+import com.baomidou.mybatisplus.annotation.Version;
+import com.ruoyi.common.core.domain.SimpleEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+/**
+ * 物流行政区划
+ *
+ * @author liangyq
+ * @date 2025-04-02 14:54
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ExpressRegion extends SimpleEntity {
+    /**
+     * 地区编码，基于行政区划代码做扩展，唯一约束
+     */
+    private String regionCode;
+    /**
+     * 地区名称
+     */
+    private String regionName;
+    /**
+     * 地区级别[1:省 2:市 3:区县]
+     */
+    private Integer regionLevel;
+    /**
+     * 上级地区编码，没有上级的默认空
+     */
+    private String parentRegionCode;
+    /**
+     * 上级地区名称，冗余
+     */
+    private String parentRegionName;
+    /**
+     * 版本号
+     */
+    @Version
+    private Long version;
+}

xkt/src/main/java/com/ruoyi/xkt/dto/express/ExpressDTO.java

@@ -60,4 +60,8 @@ public class ExpressDTO {
      * 更新时间
      */
     private Date updateTime;
+    /**
+     * 版本号
+     */
+    private Long version;
 }

xkt/src/main/java/com/ruoyi/xkt/dto/express/ExpressFeeConfigDTO.java

@@ -0,0 +1,60 @@
+package com.ruoyi.xkt.dto.express;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * 物流费用配置
+ *
+ * @author liangyq
+ * @date 2025-04-02 15:00
+ */
+@Data
+public class ExpressFeeConfigDTO {
+    /**
+     * ID
+     */
+    private Long id;
+    /**
+     * 地区编码，基于行政区划代码做扩展，唯一约束
+     */
+    private String regionCode;
+    /**
+     * 上级地区编码，没有上级的默认空
+     */
+    private String parentRegionCode;
+    /**
+     * 首件运费
+     */
+    private BigDecimal firstItemAmount;
+    /**
+     * 续费
+     */
+    private BigDecimal nextItemAmount;
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    private String delFlag;
+    /**
+     * 创建者
+     */
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 更新者
+     */
+    private String updateBy;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+    /**
+     * 版本号
+     */
+    private Long version;
+}

xkt/src/main/java/com/ruoyi/xkt/dto/express/ExpressRegionDTO.java

@@ -0,0 +1,63 @@
+package com.ruoyi.xkt.dto.express;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 物流行政区划
+ *
+ * @author liangyq
+ * @date 2025-04-02 15:00
+ */
+@Data
+public class ExpressRegionDTO {
+    /**
+     * ID
+     */
+    private Long id;
+    /**
+     * 地区编码，基于行政区划代码做扩展，唯一约束
+     */
+    private String regionCode;
+    /**
+     * 地区名称
+     */
+    private String regionName;
+    /**
+     * 地区级别[1:省 2:市 3:区县]
+     */
+    private Integer regionLevel;
+    /**
+     * 上级地区编码，没有上级的默认空
+     */
+    private String parentRegionCode;
+    /**
+     * 上级地区名称，冗余
+     */
+    private String parentRegionName;
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    private String delFlag;
+    /**
+     * 创建者
+     */
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+    /**
+     * 更新者
+     */
+    private String updateBy;
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+    /**
+     * 版本号
+     */
+    private Long version;
+}

xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDTO.java

@@ -168,5 +168,5 @@ public class StoreOrderDTO {
     /**
      * 版本号
      */
-    private Integer version;
+    private Long version;
 }

xkt/src/main/java/com/ruoyi/xkt/dto/order/StoreOrderDetailDTO.java

@@ -116,5 +116,5 @@ public class StoreOrderDetailDTO {
     /**
      * 版本号
      */
-    private Integer version;
+    private Long version;
 }

xkt/src/main/java/com/ruoyi/xkt/dto/payment/PaymentBillDTO.java

@@ -93,4 +93,8 @@ public class PaymentBillDTO {
      * 更新时间
      */
     private Date updateTime;
+    /**
+     * 版本号
+     */
+    private Long version;
 }

xkt/src/main/java/com/ruoyi/xkt/mapper/ExpressFeeConfigMapper.java

@@ -0,0 +1,13 @@
+package com.ruoyi.xkt.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.xkt.domain.ExpressFeeConfig;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author liangyq
+ * @date 2025-04-02 12:48
+ */
+@Repository
+public interface ExpressFeeConfigMapper extends BaseMapper<ExpressFeeConfig> {
+}

xkt/src/main/java/com/ruoyi/xkt/mapper/ExpressRegionMapper.java

@@ -0,0 +1,13 @@
+package com.ruoyi.xkt.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.xkt.domain.ExpressRegion;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author liangyq
+ * @date 2025-04-02 12:48
+ */
+@Repository
+public interface ExpressRegionMapper extends BaseMapper<ExpressRegion> {
+}

xkt/src/main/java/com/ruoyi/xkt/service/IStoreOrderService.java

@@ -0,0 +1,8 @@
+package com.ruoyi.xkt.service;
+
+/**
+ * @author liangyq
+ * @date 2025-04-02 13:16
+ */
+public interface IStoreOrderService {
+}

xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreOrderServiceImpl.java

@@ -0,0 +1,25 @@
+package com.ruoyi.xkt.service.impl;
+
+import com.ruoyi.xkt.mapper.StoreOrderDetailMapper;
+import com.ruoyi.xkt.mapper.StoreOrderExpressTrackMapper;
+import com.ruoyi.xkt.mapper.StoreOrderMapper;
+import com.ruoyi.xkt.mapper.StoreOrderOperationRecordMapper;
+import com.ruoyi.xkt.service.IStoreOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author liangyq
+ * @date 2025-04-02 13:19
+ */
+@Service
+public class StoreOrderServiceImpl implements IStoreOrderService {
+    @Autowired
+    private StoreOrderMapper storeOrderMapper;
+    @Autowired
+    private StoreOrderDetailMapper storeOrderDetailMapper;
+    @Autowired
+    private StoreOrderOperationRecordMapper storeOrderOperationRecordMapper;
+    @Autowired
+    private StoreOrderExpressTrackMapper storeOrderExpressTrackMapper;
+}

xkt/src/main/resources/mapper/ExpressFeeConfigMapper.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.ruoyi.xkt.mapper.ExpressFeeConfigMapper">
+
+</mapper>

xkt/src/main/resources/mapper/ExpressRegionMapper.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.ruoyi.xkt.mapper.ExpressRegionMapper">
+
+</mapper>