1.优化分销员计算一级、二级分销佣金业务

2.优化送水订单获取用户收货地址业务
3.优化收益明细订单号、用户ID查询业务
4.提现业务增加订单号，避免使用订单ID传入会与生产ID重复，导致都是已使用订单号

src/main/java/com/gxwebsoft/common/core/config/MybatisPlusConfig.java

@@ -91,18 +91,26 @@ public class MybatisPlusConfig {
                         "sys_dictionary",
                         "sys_dictionary_data",
                         "apps_test_data",
-                        "cms_lang"
+                        "cms_lang",
 //                        "hjm_car",
 //                        "hjm_fence"
 //                        "cms_website"
 //                        "sys_user"
 //                        "cms_domain"
 //                        "shop_order_goods",
-//                        "shop_goods"
+                        "shop_goods",
 //                        "shop_users",
-//                        "shop_order"  // 移除shop_order，改为通过注解控制
+                        "shop_order" , // 移除shop_order，改为通过注解控制
 //                        "shop_order_info",
 //                        "booking_user_invoice"
+                        "shop_order_goods",
+                        "glt_ticket_template",
+                        "glt_user_ticket",
+                        "glt_user_ticket_release",
+                        "glt_user_ticket_log",
+                        "shop_dealer_user",
+                        "shop_dealer_order",
+                        "shop_dealer_referee"
                 ).contains(tableName);
             }
         };

src/main/java/com/gxwebsoft/common/core/config/SwaggerConfig.java

@@ -87,14 +87,15 @@ public class SwaggerConfig {
     }
 
     /**
-     * OA 模块分组
+     * Glt 模块分组
      */
     @Bean
-    public GroupedOpenApi oaApi() {
+    public GroupedOpenApi gltApi() {
         return GroupedOpenApi.builder()
-                .group("oa")
-                .pathsToMatch("/api/oa/**")
-                .packagesToScan("com.gxwebsoft.oa")
+                .group("glt")
+                // 订单等用户侧接口在 shop 包内，但路径使用 /api/user/**（前端统一 user 侧 API 前缀）
+                .pathsToMatch("/api/glt/**", "/api/user/**")
+                .packagesToScan("com.gxwebsoft.glt")
                 .build();
     }
 

src/main/java/com/gxwebsoft/common/core/enums/ShopDealerCapitalUpdateEnum.java

@@ -0,0 +1,38 @@
+package com.gxwebsoft.common.core.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 用户分销钱包交易业务分类
+ * @author xm
+ */
+@AllArgsConstructor
+@Getter
+public enum ShopDealerCapitalUpdateEnum {
+
+    DISTRIBUTION_INCOME(10, "分销收入", true),
+    MANAGEMENT_INCOME(11, "团队管理津贴收入", true),
+    DIVIDEND_INCOME(12, "分红收入", true),
+    PROMOTION_INCOME(13, "现场推广收入", true),
+    WITHDRAW_PAYMENT(20, "提现支出", false),
+    TRANSFER_PAYMENT(30, "转账支出", false),
+    TRANSFER_INCOME(40, "转账收入", true),
+    FREEZE_MONEY_THAW(50, "佣金解冻", true),
+    DELIVERY_INCOME(60, "配送奖励", true),
+    ORDER_REFUND(70, "佣金退回(退单)", false),
+    ;
+
+    /**
+     * 业务分类
+     */
+    private final Integer type;
+    /**
+     * 说明
+     */
+    private final String description;
+    /**
+     * 是否为增加余额
+     */
+    private final boolean add;
+}

src/main/java/com/gxwebsoft/common/core/enums/ShopDealerTypeEnum.java

@@ -0,0 +1,28 @@
+package com.gxwebsoft.common.core.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * 订单状态枚举
+ */
+@AllArgsConstructor
+@Getter
+public enum ShopDealerTypeEnum {
+
+
+    FREEZE_ACCOUNT(1, "操作冻结账户余额"),
+    WITHDRAW_ACCOUNT(2, "操作提现账户余额【直接结算】"),
+    DEFROST(3, "解冻");
+
+    private final Integer code;
+    private final String desc;
+
+    public Integer getCode() {
+        return code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+}

src/main/java/com/gxwebsoft/common/system/entity/User.java

@@ -262,6 +262,9 @@ public class User implements UserDetails {
     @Schema(description = "微信unionid")
     private String unionid;
 
+    @Schema(description = "核销权限是否开启 0-未开启 1-已开启")
+    private Integer verifyFlag;
+
     @Schema(description = "关联用户ID")
     @TableField(exist = false)
     private Integer sysUserId;

src/main/java/com/gxwebsoft/common/system/mapper/UserMapper.java

@@ -49,6 +49,9 @@ public interface UserMapper extends BaseMapper<User> {
     @InterceptorIgnore(tenantLine = "true")
     List<User> getOne(@Param("param") UserParam param);
 
+    @InterceptorIgnore(tenantLine = "true")
+    User getById(@Param("userId") Integer userId);
+
     List<User> selectListStatisticsRel(@Param("param") UserParam param);
 
     @InterceptorIgnore(tenantLine = "true")

src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml

@@ -260,5 +260,8 @@
     WHERE a.user_id = #{userId}
       AND a.deleted = 0
   </select>
+    <select id="getById" resultType="com.gxwebsoft.common.system.entity.User">
+        SELECT * FROM gxwebsoft_core.sys_user WHERE user_id = #{userId} and deleted = 0
+    </select>
 
 </mapper>

src/main/java/com/gxwebsoft/common/system/redis/OrderNoUtils.java

@@ -0,0 +1,38 @@
+package com.gxwebsoft.common.system.redis;
+
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.Resource;
+import java.time.Duration;
+import java.time.LocalDateTime;
+
+/**
+ * 支付序号的 Redis DAO
+ *
+ * @author 芋道源码
+ */
+@Repository
+public class OrderNoUtils {
+
+    @Resource
+    private StringRedisTemplate stringRedisTemplate;
+
+    /**
+     * 生成序号
+     * @param prefix 前缀
+     * @return 序号
+     */
+    public String generate(String prefix) {
+        // 递增序号
+        String noPrefix = prefix + DateUtil.format(LocalDateTime.now(), DatePattern.PURE_DATETIME_PATTERN);
+        String key = noPrefix;
+        Long no = stringRedisTemplate.opsForValue().increment(key);
+        // 设置过期时间
+        stringRedisTemplate.expire(key, Duration.ofMinutes(1L));
+        return noPrefix + no;
+    }
+
+}

src/main/java/com/gxwebsoft/glt/controller/GltTicketOrderController.java

@@ -329,16 +329,14 @@ public class GltTicketOrderController extends BaseController {
         if (addr == null) {
             return null;
         }
-        if (StrUtil.isNotBlank(addr.getFullAddress())) {
-            return addr.getFullAddress();
-        }
         // 兼容旧数据：fullAddress 为空时，拼接省市区 + 详细地址
         return StrUtil.blankToDefault(
                 StrUtil.join("",
                         StrUtil.nullToEmpty(addr.getProvince()),
                         StrUtil.nullToEmpty(addr.getCity()),
                         StrUtil.nullToEmpty(addr.getRegion()),
-                        StrUtil.nullToEmpty(addr.getAddress())
+                        StrUtil.nullToEmpty(addr.getAddress()),
+                        StrUtil.nullToEmpty(addr.getFullAddress())
                 ),
                 addr.getAddress()
         );

src/main/java/com/gxwebsoft/glt/controller/GltUserTicketReleaseController.java

@@ -1,15 +1,15 @@
 package com.gxwebsoft.glt.controller;
 
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.web.ApiResult;
 import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.User;
-import com.gxwebsoft.glt.service.GltUserTicketReleaseService;
 import com.gxwebsoft.glt.entity.GltUserTicketRelease;
 import com.gxwebsoft.glt.param.GltUserTicketReleaseParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.glt.service.GltUserTicketReleaseService;
+import com.gxwebsoft.glt.service.impl.GltUserTicketAutoReleaseServiceImpl;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -31,6 +31,9 @@ public class GltUserTicketReleaseController extends BaseController {
     @Resource
     private GltUserTicketReleaseService gltUserTicketReleaseService;
 
+    @Resource
+    private GltUserTicketAutoReleaseServiceImpl gltUserTicketAutoReleaseService;
+
     @PreAuthorize("hasAuthority('glt:gltUserTicketRelease:list')")
     @Operation(summary = "分页查询水票释放")
     @GetMapping("/page")
@@ -126,4 +129,11 @@ public class GltUserTicketReleaseController extends BaseController {
         return fail("删除失败");
     }
 
+    @Operation(summary = "水票释放测试")
+    @PostMapping("/releaseTask")
+    public ApiResult<?> releaseTask() {
+        gltUserTicketAutoReleaseService.releaseTask();
+        return success(true);
+    }
+
 }

src/main/java/com/gxwebsoft/glt/entity/GltTicketOrder.java

@@ -1,9 +1,6 @@
 package com.gxwebsoft.glt.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -22,16 +19,20 @@ import java.time.LocalDateTime;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Schema(name = "GltTicketOrder对象", description = "送水订单")
+@TableName("glt_ticket_order")
 public class GltTicketOrder implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    @Schema(description = "订单编号")
+    private String no;
+
     @Schema(description = "用户水票ID")
     private Integer userTicketId;
 
-    @Schema(description = "订单编号")
+    @Schema(description = "关联订单编号")
     @TableField(exist = false)
     private String orderNo;
 
@@ -197,6 +198,10 @@ public class GltTicketOrder implements Serializable {
     @Schema(description = "楼层（步梯+送上楼时有值，从2开始）")
     private Integer deliveryFloor;
 
+    @Schema(description = "详细地址")
+    @TableField(exist = false)
+    private String fullAddress;
+
     @Schema(description = "配送费（步梯+送上楼时计算：数量 × (楼层-1)）")
     private BigDecimal deliveryFee;
 

src/main/java/com/gxwebsoft/glt/entity/GltTicketTemplate.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -19,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Schema(name = "GltTicketTemplate对象", description = "水票")
+@TableName("glt_ticket_template")
 public class GltTicketTemplate implements Serializable {
     private static final long serialVersionUID = 1L;
 

src/main/java/com/gxwebsoft/glt/entity/GltUserTicket.java

@@ -1,12 +1,9 @@
 package com.gxwebsoft.glt.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -22,6 +19,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Schema(name = "GltUserTicket对象", description = "我的水票")
+@TableName("glt_user_ticket")
 public class GltUserTicket implements Serializable {
     private static final long serialVersionUID = 1L;
 

src/main/java/com/gxwebsoft/glt/entity/GltUserTicketLog.java

@@ -1,10 +1,8 @@
 package com.gxwebsoft.glt.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -20,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Schema(name = "GltUserTicketLog对象", description = "消费日志")
+@TableName("glt_user_ticket_log")
 public class GltUserTicketLog implements Serializable {
     private static final long serialVersionUID = 1L;
 

src/main/java/com/gxwebsoft/glt/entity/GltUserTicketRelease.java

@@ -1,10 +1,8 @@
 package com.gxwebsoft.glt.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import java.io.Serializable;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -20,6 +18,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Schema(name = "GltUserTicketRelease对象", description = "水票释放")
+@TableName("glt_user_ticket_release")
 public class GltUserTicketRelease implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -27,7 +26,7 @@ public class GltUserTicketRelease implements Serializable {
     private Long id;
 
     @Schema(description = "水票ID")
-    private Long userTicketId;
+    private Integer userTicketId;
 
     @Schema(description = "用户ID")
     private Integer userId;
@@ -57,6 +56,9 @@ public class GltUserTicketRelease implements Serializable {
     @Schema(description = "状态")
     private Integer status;
 
+    @Schema(description = "备注")
+    private String remark;
+
     @Schema(description = "是否删除, 0否, 1是")
     @TableLogic
     private Integer deleted;

src/main/java/com/gxwebsoft/glt/mapper/GltUserTicketReleaseMapper.java

@@ -37,6 +37,13 @@ public interface GltUserTicketReleaseMapper extends BaseMapper<GltUserTicketRele
      */
     List<GltUserTicketRelease> selectListRel(@Param("param") GltUserTicketReleaseParam param);
 
+    /**
+     * 查询当月待释放水票数据
+     * @param limitNum 查询数量
+     * @return List<User>
+     */
+    List<GltUserTicketRelease> getThisMonthReleaseList(@Param("limitNum") Integer limitNum);
+
     /**
      * 查询待释放且到期的记录（加行锁，防止多实例重复处理）
      *

src/main/java/com/gxwebsoft/glt/mapper/xml/GltUserTicketReleaseMapper.xml

@@ -58,5 +58,23 @@
     <select id="selectListRel" resultType="com.gxwebsoft.glt.entity.GltUserTicketRelease">
         <include refid="selectSql"></include>
     </select>
+    <select id="getThisMonthReleaseList" resultType="com.gxwebsoft.glt.entity.GltUserTicketRelease">
+        SELECT
+            id,
+            user_ticket_id,
+            user_id,
+            release_qty,
+            tenant_id
+        FROM
+            glt_user_ticket_release
+        WHERE
+            STATUS = 0
+          AND deleted = 0
+          AND release_qty > 0
+          AND DATE_FORMAT(release_time, '%Y-%m') = DATE_FORMAT(NOW(), '%Y-%m')
+        ORDER BY
+            release_time ASC
+            LIMIT #{limitNum}
+    </select>
 
 </mapper>

src/main/java/com/gxwebsoft/glt/service/GltTicketIssueService.java

@@ -1,21 +1,19 @@
 package com.gxwebsoft.glt.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.gxwebsoft.common.core.annotation.IgnoreTenant;
 import com.gxwebsoft.glt.entity.GltTicketTemplate;
 import com.gxwebsoft.glt.entity.GltUserTicket;
 import com.gxwebsoft.glt.entity.GltUserTicketLog;
 import com.gxwebsoft.glt.entity.GltUserTicketRelease;
+import com.gxwebsoft.glt.task.DealerOrderSettlement10584Task;
 import com.gxwebsoft.shop.entity.ShopOrder;
 import com.gxwebsoft.shop.entity.ShopOrderGoods;
+import com.gxwebsoft.shop.mapper.ShopOrderMapper;
 import com.gxwebsoft.shop.service.ShopOrderGoodsService;
-import com.gxwebsoft.shop.service.ShopOrderService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.scheduling.annotation.Async;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionTemplate;
@@ -48,7 +46,7 @@ public class GltTicketIssueService {
         NO_TEMPLATE
     }
 
-    private final ShopOrderService shopOrderService;
+    private final ShopOrderMapper shopOrderMapper;
     private final ShopOrderGoodsService shopOrderGoodsService;
 
     private final GltTicketTemplateService gltTicketTemplateService;
@@ -56,6 +54,7 @@ public class GltTicketIssueService {
     private final GltUserTicketReleaseService gltUserTicketReleaseService;
     private final GltUserTicketLogService gltUserTicketLogService;
     private final TransactionTemplate transactionTemplate;
+    private final DealerOrderSettlement10584Task dealerOrderSettlement;
 
     /**
      * 扫描“今日订单”，执行套票发放。
@@ -86,7 +85,7 @@ public class GltTicketIssueService {
         LocalDateTime todayStart = LocalDate.now().atStartOfDay();
         LocalDateTime tomorrowStart = todayStart.plusDays(1);
 
-        List<ShopOrder> orders = shopOrderService.list(
+        List<ShopOrder> orders = shopOrderMapper.selectList(
             new LambdaQueryWrapper<ShopOrder>()
                 .eq(ShopOrder::getTenantId, tenantId)
                 .in(ShopOrder::getFormId, uniqueGoodsIds)
@@ -130,10 +129,21 @@ public class GltTicketIssueService {
             tenantId, uniqueGoodsIds, orders.size(), success, skipped, failed);
     }
 
+    /**
+     * 商品订单支付成功后调后需处理业务
+     * @param orderNo   订单号
+     * @param tenantId  租户ID
+     */
     @Async
-//    @Scheduled(cron = "0/1 * 4-22 * * ?")   没秒钟执行一次
-    public void paySuccessExecute(String orderNo, Integer tenantId){
+    public void paySuccessTask(String orderNo, Integer tenantId){
+        //1.发送水票
         suerTicketRelease(orderNo, tenantId);
+
+        //2.执行分销员分销、统计门店/服务商分销业务
+        dealerOrderSettlement.orderSettlement(orderNo);
+
+        //3.执行平台分红业务 TODO 待开发
+
     }
 
     /**
@@ -141,25 +151,33 @@ public class GltTicketIssueService {
      * @param orderNo   订单号
      * @param tenantId  租户ID
      */
+    @Transactional
     public void suerTicketRelease(String orderNo, Integer tenantId){
         //1.订单为空跳过执行
-        ShopOrder shopOrder = shopOrderService.getByOrderNo(orderNo, tenantId);
+        ShopOrder shopOrder = shopOrderMapper.selectOne(new LambdaQueryWrapper<ShopOrder>()
+                .eq(ShopOrder::getOrderNo, orderNo)
+                .eq(ShopOrder::getTenantId, tenantId));
         if(shopOrder == null){
             return;
         }
 
-        //2.跳过已完成发放套票订单
+        //2.只有水票订单才需要发送水票
+        if(!(shopOrder.getWaterTicketFlag() != null && shopOrder.getWaterTicketFlag() == 1)){
+            return;
+        }
+
+        //3.跳过已完成发放套票订单
         if(shopOrder.getOrderStatus() == 1){
             return;
         }
 
-        //3.订单商品为空跳过执行
+        //4.订单商品为空跳过执行
         List<ShopOrderGoods> goodsList = shopOrderGoodsService.getListByOrderIdIgnoreTenant(shopOrder.getOrderId());
         if (CollectionUtils.isEmpty(goodsList)) {
             return;
         }
 
-        //4.执行水票发放业务【】
+        //5.执行水票发放业务
         AtomicBoolean release = new AtomicBoolean(false);
         goodsList.forEach(orderGood ->{
             IssueOutcome outcome = transactionTemplate.execute(status -> doIssueOne(tenantId, shopOrder, orderGood));
@@ -168,16 +186,12 @@ public class GltTicketIssueService {
             }
         });
 
-        //5.更新商品订单为已完成、已收到赠品状态
+        //6.更新商品订单为已完成、已收到赠品状态
         if (release.get()) {
-            shopOrderService.update(new LambdaUpdateWrapper<ShopOrder>()
-                    .eq(ShopOrder::getOrderId, shopOrder.getOrderId())
-                    .eq(ShopOrder::getTenantId, tenantId)
-                    .eq(ShopOrder::getOrderStatus, 0)
-                    .set(ShopOrder::getOrderStatus, 1)
-                    .set(ShopOrder::getHasTakeGift, true)
-                    .set(ShopOrder::getUpdateTime, LocalDateTime.now())
-            );
+            shopOrder.setOrderStatus(1);
+            shopOrder.setHasTakeGift(true);
+            shopOrder.setUpdateTime(LocalDateTime.now());
+            shopOrderMapper.updateById(shopOrder);
         }
     }
 
@@ -208,15 +222,10 @@ public class GltTicketIssueService {
         if (shouldCompleteOrder) {
             LocalDateTime now = LocalDateTime.now();
             // 任务执行完后将订单置为“已完成”，避免后续扫描重复处理（幂等虽可挡住，但会产生大量无意义查询）。
-            shopOrderService.update(
-                new LambdaUpdateWrapper<ShopOrder>()
-                    .eq(ShopOrder::getOrderId, order.getOrderId())
-                    .eq(ShopOrder::getTenantId, tenantId)
-                    .eq(ShopOrder::getOrderStatus, 0)
-                    .set(ShopOrder::getOrderStatus, 1)
-                    .set(ShopOrder::getHasTakeGift, true)
-                    .set(ShopOrder::getUpdateTime, now)
-            );
+            order.setOrderStatus(1);
+            order.setHasTakeGift(true);
+            order.setUpdateTime(LocalDateTime.now());
+            shopOrderMapper.updateById(order);
         }
 
         return issuedCount;
@@ -237,7 +246,7 @@ public class GltTicketIssueService {
         // - 这里先对商城订单行加行锁，保证同一订单在同一时刻只会被一个事务处理。
         //   (注意：需数据库支持 SELECT ... FOR UPDATE，且 shop_order.order_id 为主键/有索引)
         if (order.getOrderId() != null) {
-            shopOrderService.getOne(
+            shopOrderMapper.selectOne(
                 new LambdaQueryWrapper<ShopOrder>()
                     .eq(ShopOrder::getOrderId, order.getOrderId())
                     .eq(ShopOrder::getTenantId, tenantId)
@@ -488,7 +497,7 @@ public class GltTicketIssueService {
                                              LocalDateTime releaseTime,
                                              LocalDateTime now) {
         GltUserTicketRelease r = new GltUserTicketRelease();
-        r.setUserTicketId(userTicket.getId() != null ? userTicket.getId().longValue() : null);
+        r.setUserTicketId(userTicket.getId() != null ? userTicket.getId() : null);
         r.setUserId(userTicket.getUserId());
         r.setPeriodNo(periodNo);
         r.setReleaseQty(releaseQty);

src/main/java/com/gxwebsoft/glt/service/GltTicketRevokeService.java

@@ -133,7 +133,7 @@ public class GltTicketRevokeService {
                 LambdaUpdateWrapper<GltUserTicketRelease> uw = new LambdaUpdateWrapper<GltUserTicketRelease>()
                     .eq(GltUserTicketRelease::getTenantId, tenantId)
                     .eq(GltUserTicketRelease::getDeleted, 0)
-                    .eq(GltUserTicketRelease::getUserTicketId, userTicketId.longValue())
+                    .eq(GltUserTicketRelease::getUserTicketId, userTicketId)
                     // status 为空时也视为“未完成”
                     .and(w -> w.ne(GltUserTicketRelease::getStatus, RELEASE_STATUS_DONE)
                         .or().isNull(GltUserTicketRelease::getStatus))

src/main/java/com/gxwebsoft/glt/service/GltUserTicketAutoReleaseService.java

@@ -17,10 +17,8 @@ public interface GltUserTicketAutoReleaseService {
     int releaseDue(LocalDateTime now, int batchSize);
 
     /**
-     * 释放到期的冻结水票（使用系统当前时间）
+     * 释放到期的冻结水票【当次执行1000条】
      */
-    default int releaseDue(int batchSize) {
-        return releaseDue(LocalDateTime.now(), batchSize);
-    }
+    void releaseTask();
 }
 

src/main/java/com/gxwebsoft/glt/service/impl/GltTicketOrderServiceImpl.java

@@ -4,11 +4,14 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.common.core.enums.ShopDealerCapitalUpdateEnum;
+import com.gxwebsoft.common.core.enums.ShopDealerTypeEnum;
 import com.gxwebsoft.common.core.exception.BusinessException;
 import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.User;
 import com.gxwebsoft.common.system.mapper.UserMapper;
+import com.gxwebsoft.common.system.redis.OrderNoUtils;
 import com.gxwebsoft.glt.entity.GltTicketOrder;
 import com.gxwebsoft.glt.entity.GltUserTicket;
 import com.gxwebsoft.glt.entity.GltUserTicketLog;
@@ -18,15 +21,15 @@ import com.gxwebsoft.glt.param.GltTicketOrderParam;
 import com.gxwebsoft.glt.service.GltTicketOrderService;
 import com.gxwebsoft.glt.service.GltUserTicketLogService;
 import com.gxwebsoft.glt.service.GltUserTicketService;
-import com.gxwebsoft.shop.entity.ShopDealerCapital;
-import com.gxwebsoft.shop.entity.ShopDealerUser;
-import com.gxwebsoft.shop.entity.ShopOrder;
-import com.gxwebsoft.shop.entity.ShopOrderGoods;
+import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto;
+import com.gxwebsoft.shop.entity.*;
+import com.gxwebsoft.shop.mapper.ShopUserAddressMapper;
 import com.gxwebsoft.shop.service.ShopDealerCapitalService;
 import com.gxwebsoft.shop.service.ShopDealerUserService;
 import com.gxwebsoft.shop.service.ShopOrderGoodsService;
 import com.gxwebsoft.shop.service.ShopOrderService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -39,6 +42,7 @@ import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 送水订单Service实现
@@ -83,11 +87,29 @@ public class GltTicketOrderServiceImpl extends ServiceImpl<GltTicketOrderMapper,
     @Resource
     private ShopOrderGoodsService shopOrderGoodsService;
 
+    @Resource
+    private ShopUserAddressMapper shopUserAddressMapper;
+
+    @Resource
+    private OrderNoUtils orderNoUtils;
+
     @Override
     public PageResult<GltTicketOrder> pageRel(GltTicketOrderParam param) {
         PageParam<GltTicketOrder, GltTicketOrderParam> page = new PageParam<>(param);
         page.setDefaultOrder("sort_number asc, create_time desc");
         List<GltTicketOrder> list = baseMapper.selectPageRel(page, param);
+        if(CollectionUtils.isNotEmpty(list)){
+            List<Integer> addressIdList = list.stream().map(GltTicketOrder::getAddressId).distinct().collect(Collectors.toList());
+            List<ShopUserAddress> userAddressList = shopUserAddressMapper.selectBatchIds(addressIdList);
+            if(CollectionUtils.isNotEmpty(userAddressList)){
+                list.forEach(ticketOrder ->{
+                    ShopUserAddress shopUserAddress = userAddressList.stream().filter(address -> ticketOrder.getAddressId().equals(address.getId())).findFirst().orElse(null);
+                    if(shopUserAddress != null){
+                        ticketOrder.setFullAddress(shopUserAddress.getFullAddress());
+                    }
+                });
+            }
+        }
         return new PageResult<>(list, page.getTotal());
     }
 
@@ -116,6 +138,10 @@ public class GltTicketOrderServiceImpl extends ServiceImpl<GltTicketOrderMapper,
         if (userId == null) {
             throw new BusinessException("请先登录");
         }
+
+        String no = orderNoUtils.generate("S");
+        gltTicketOrder.setNo(no);
+
         Integer userTicketId = gltTicketOrder.getUserTicketId();
         if (userTicketId == null) {
             throw new BusinessException("userTicketId不能为空");
@@ -742,6 +768,25 @@ public class GltTicketOrderServiceImpl extends ServiceImpl<GltTicketOrderMapper,
             }
         }
 
+        //查询未完成订单，完成资金解冻
+        LambdaQueryWrapper<ShopOrder> orderLambdaQueryWrapper;
+        if(shopOrderId != null){
+            orderLambdaQueryWrapper = new LambdaQueryWrapper<ShopOrder>().eq(ShopOrder::getOrderId, shopOrderId).eq(ShopOrder::getOrderStatus, 0);
+        }else{
+            orderLambdaQueryWrapper = new LambdaQueryWrapper<ShopOrder>().eq(ShopOrder::getOrderId, shopOrderNo).eq(ShopOrder::getOrderStatus, 0);
+        }
+        ShopOrder order = shopOrderService.getOne(orderLambdaQueryWrapper);
+        if(order != null){
+            ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto();
+            reduceDto.setTypeEnum(ShopDealerTypeEnum.DEFROST);
+            reduceDto.setOrderUserId(order.getUserId());
+            reduceDto.setOrderNo(order.getOrderNo());
+            reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.FREEZE_MONEY_THAW);
+
+            //按订单号资金解冻
+            shopDealerUserService.reduceBalance(reduceDto);
+        }
+
         LambdaUpdateWrapper<ShopOrder> uw = new LambdaUpdateWrapper<ShopOrder>()
             .eq(ShopOrder::getTenantId, tenantId)
             .eq(ShopOrder::getDeleted, 0)
@@ -753,7 +798,6 @@ public class GltTicketOrderServiceImpl extends ServiceImpl<GltTicketOrderMapper,
         } else {
             uw.eq(ShopOrder::getOrderNo, shopOrderNo);
         }
-
         boolean updated = shopOrderService.update(uw);
         if (updated) {
             return;

src/main/java/com/gxwebsoft/glt/service/impl/GltUserTicketAutoReleaseServiceImpl.java

@@ -1,5 +1,6 @@
 package com.gxwebsoft.glt.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.gxwebsoft.glt.entity.GltUserTicket;
 import com.gxwebsoft.glt.entity.GltUserTicketLog;
 import com.gxwebsoft.glt.entity.GltUserTicketRelease;
@@ -7,13 +8,20 @@ import com.gxwebsoft.glt.mapper.GltUserTicketLogMapper;
 import com.gxwebsoft.glt.mapper.GltUserTicketMapper;
 import com.gxwebsoft.glt.mapper.GltUserTicketReleaseMapper;
 import com.gxwebsoft.glt.service.GltUserTicketAutoReleaseService;
-import lombok.RequiredArgsConstructor;
+import com.gxwebsoft.glt.service.GltUserTicketLogService;
+import com.gxwebsoft.glt.service.GltUserTicketReleaseService;
+import com.gxwebsoft.glt.service.GltUserTicketService;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 冻结水票自动释放实现：
@@ -23,7 +31,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
-@RequiredArgsConstructor
+@AllArgsConstructor
 public class GltUserTicketAutoReleaseServiceImpl implements GltUserTicketAutoReleaseService {
 
     /**
@@ -44,6 +52,13 @@ public class GltUserTicketAutoReleaseServiceImpl implements GltUserTicketAutoRel
     private final GltUserTicketMapper userTicketMapper;
     private final GltUserTicketLogMapper userTicketLogMapper;
 
+    private GltUserTicketReleaseService gltUserTicketReleaseService;
+
+    private GltUserTicketService gltUserTicketService;
+
+    private GltUserTicketLogService gltUserTicketLogService;
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int releaseDue(LocalDateTime now, int batchSize) {
@@ -71,12 +86,7 @@ public class GltUserTicketAutoReleaseServiceImpl implements GltUserTicketAutoRel
                 continue;
             }
 
-            long userTicketIdLong = rel.getUserTicketId();
-            if (userTicketIdLong > Integer.MAX_VALUE || userTicketIdLong < 1) {
-                markFailed(rel.getId(), now, "userTicketId超范围");
-                continue;
-            }
-            Integer userTicketId = (int) userTicketIdLong;
+            Integer userTicketId = rel.getUserTicketId();
 
             // 先释放冻结数量（条件更新，确保 frozen_qty >= qty）
             int updated = userTicketMapper.releaseFrozenQty(
@@ -129,4 +139,96 @@ public class GltUserTicketAutoReleaseServiceImpl implements GltUserTicketAutoRel
         releaseMapper.updateStatus(releaseId, RELEASE_STATUS_FAILED, now);
         log.warn("冻结水票释放标记失败 - releaseId={}, reason={}", releaseId, reason);
     }
+
+    @Transactional
+    public void releaseTask() {
+        LocalDateTime now = LocalDateTime.now();
+        log.info("***执行水票释放任务***-执行时间：{}", now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
+        long start = System.currentTimeMillis();
+        List<GltUserTicketRelease> releaseList = releaseMapper.getThisMonthReleaseList(1000);
+        if(CollectionUtils.isEmpty(releaseList)){
+            log.info("***本轮任务无待释放水票数据***");
+            return;
+        }
+
+        //查询用户水票信息
+        List<Integer> userTickIdList = releaseList.stream().map(GltUserTicketRelease::getUserTicketId).distinct().collect(Collectors.toList());
+        LambdaQueryWrapper<GltUserTicket> userTicketLambdaQueryWrapper = new LambdaQueryWrapper<GltUserTicket>().select(GltUserTicket::getId, GltUserTicket::getAvailableQty,
+                        GltUserTicket::getFrozenQty, GltUserTicket::getReleasedQty).in(GltUserTicket::getId, userTickIdList);
+        List<GltUserTicket> userTicketList = userTicketMapper.selectList(userTicketLambdaQueryWrapper);
+
+        //创建修改用户水票集合、水票释放计划记录集合
+        List<GltUserTicket> updateUserTicketList = new ArrayList<>();
+        List<GltUserTicketLog> userTicketLogList = new ArrayList<>();
+
+        //遍历水票释放数据执行释放任务
+        releaseList.forEach(release ->{
+            //1.缺少水票ID、用户ID、租户ID记录错误记录
+            if(release.getUserTicketId() == null || release.getUserId() == null || release.getTenantId() == null){
+                release.setRemark("缺少userTicketId/userId/tenantId");
+                release.setStatus(2);
+                release.setUpdateTime(now);
+            }
+
+            GltUserTicket userTicket = userTicketList.stream().filter(gltUserTicket -> release.getUserTicketId().equals(gltUserTicket.getId())).findFirst().orElse(null);
+            if(userTicket != null){
+                Integer releaseQty = release.getReleaseQty();
+                if(userTicket.getFrozenQty() > releaseQty){
+                    //更改用户水票可用数量、冻结数量、已释放数量
+                    userTicket.setAvailableQty(userTicket.getAvailableQty() + releaseQty);
+                    userTicket.setFrozenQty(userTicket.getFrozenQty() - releaseQty);
+                    userTicket.setReleasedQty(userTicket.getReleasedQty() + releaseQty);
+                    userTicket.setUpdateTime(now);
+                    updateUserTicketList.add(userTicket);
+
+                    //记录水票释放计划为成功释放状态
+                    release.setStatus(1);
+                    release.setRemark("success");
+                    release.setUpdateTime(now);
+
+                    //生成水票释放记录
+                    GltUserTicketLog ticketLog = new GltUserTicketLog();
+                    ticketLog.setUserTicketId(release.getUserTicketId());
+                    ticketLog.setChangeType(CHANGE_TYPE_RELEASE);
+                    ticketLog.setChangeAvailable(releaseQty);
+                    ticketLog.setChangeFrozen(-releaseQty);
+                    ticketLog.setChangeUsed(0);
+                    ticketLog.setAvailableAfter(userTicket.getAvailableQty());
+                    ticketLog.setFrozenAfter(userTicket.getFrozenQty());
+                    ticketLog.setUsedAfter(userTicket.getUsedQty());
+                    ticketLog.setOrderId(Integer.valueOf(String.valueOf(release.getId())));
+                    ticketLog.setUserId(release.getUserId());
+                    ticketLog.setComments("冻结水票到期释放");
+                    ticketLog.setTenantId(release.getTenantId());
+                    ticketLog.setCreateTime(now);
+                    ticketLog.setUpdateTime(now);
+                    userTicketLogList.add(ticketLog);
+                }else {
+                    release.setRemark("释放数量大于冻结数量,释放:" + releaseQty + "，冻结:" + userTicket.getFrozenQty());
+                    release.setStatus(2);
+                    release.setUpdateTime(LocalDateTime.now());
+                }
+            }else {
+                release.setRemark("查询不到水票数据");
+                release.setStatus(2);
+                release.setUpdateTime(LocalDateTime.now());
+            }
+        });
+
+        if(CollectionUtils.isNotEmpty(releaseList)){
+            gltUserTicketReleaseService.updateBatchById(releaseList);
+        }
+
+        if(CollectionUtils.isNotEmpty(updateUserTicketList)){
+            gltUserTicketService.updateBatchById(updateUserTicketList);
+        }
+
+        if(CollectionUtils.isNotEmpty(userTicketLogList)){
+            gltUserTicketLogService.saveBatch(userTicketLogList);
+        }
+
+        long end = System.currentTimeMillis();
+        long costMs = end - start;
+        log.info("***执行水票释放任务完成*** 执行耗时：{} ms", costMs);
+    }
 }

src/main/java/com/gxwebsoft/glt/task/DealerOrderSettlement10584Task.java

@@ -1,41 +1,38 @@
 package com.gxwebsoft.glt.task;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.gxwebsoft.common.core.annotation.IgnoreTenant;
-import com.gxwebsoft.glt.entity.GltTicketTemplate;
-import com.gxwebsoft.glt.service.GltTicketTemplateService;
-import com.gxwebsoft.shop.entity.ShopDealerCapital;
-import com.gxwebsoft.shop.entity.ShopDealerOrder;
-import com.gxwebsoft.shop.entity.ShopDealerReferee;
-import com.gxwebsoft.shop.entity.ShopDealerSetting;
-import com.gxwebsoft.shop.entity.ShopDealerUser;
-import com.gxwebsoft.shop.entity.ShopGoods;
-import com.gxwebsoft.shop.entity.ShopOrder;
-import com.gxwebsoft.shop.entity.ShopOrderGoods;
+import com.gxwebsoft.common.core.enums.ShopDealerCapitalUpdateEnum;
+import com.gxwebsoft.common.core.enums.ShopDealerTypeEnum;
 import com.gxwebsoft.common.system.entity.User;
 import com.gxwebsoft.common.system.mapper.UserMapper;
-import com.gxwebsoft.shop.service.ShopDealerCapitalService;
-import com.gxwebsoft.shop.service.ShopDealerOrderService;
-import com.gxwebsoft.shop.service.ShopDealerRefereeService;
-import com.gxwebsoft.shop.service.ShopDealerSettingService;
-import com.gxwebsoft.shop.service.ShopDealerUserService;
-import com.gxwebsoft.shop.service.ShopGoodsService;
-import com.gxwebsoft.shop.service.ShopOrderService;
-import com.gxwebsoft.shop.service.ShopOrderGoodsService;
+import com.gxwebsoft.glt.entity.GltTicketTemplate;
+import com.gxwebsoft.glt.service.GltTicketTemplateService;
+import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto;
+import com.gxwebsoft.shop.entity.*;
+import com.gxwebsoft.shop.mapper.ShopDealerRefereeMapper;
+import com.gxwebsoft.shop.mapper.ShopOrderMapper;
+import com.gxwebsoft.shop.service.*;
 import com.gxwebsoft.shop.util.UpstreamUserFinder;
-import com.alibaba.fastjson.JSONObject;
+import com.gxwebsoft.shop.vo.ShopDealerRefereeVO;
+import com.gxwebsoft.shop.vo.ShopOrderGoodsVO;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionTemplate;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * 租户10584：分销订单结算任务
@@ -50,7 +47,6 @@ public class DealerOrderSettlement10584Task {
 
     private static final BigDecimal RATE_0_10 = new BigDecimal("0.10");
     private static final BigDecimal RATE_0_05 = new BigDecimal("0.05");
-    private static final BigDecimal RATE_0_03 = new BigDecimal("0.03");
     private static final BigDecimal RATE_0_02 = new BigDecimal("0.02");
     private static final BigDecimal RATE_0_01 = new BigDecimal("0.01");
     private static final BigDecimal TOTAL_DEALER_DIVIDEND_RATE = RATE_0_01;
@@ -92,14 +88,23 @@ public class DealerOrderSettlement10584Task {
     @Resource
     private GltTicketTemplateService gltTicketTemplateService;
 
+    @Resource
+    private ShopOrderMapper shopOrderMapper;
+
+    @Resource
+    private ShopDealerRefereeMapper shopDealerRefereeMapper;
+
     /**
      * 每10秒执行一次。
      */
-    @Scheduled(cron = "0/10 * * * * ?")
+//    @Scheduled(cron = "0/10 * * * * ?")
     @IgnoreTenant("该定时任务仅处理租户10584，但需要显式按tenantId过滤，避免定时任务线程无租户上下文导致查询异常")
     public void settleTenant10584Orders() {
         try {
+            //获取水票模板对应的商品信息列表
             Set<Integer> waterFormIds = loadWaterFormIds();
+
+            //查询商品列表存在已支付未核销订单数据
             List<ShopOrder> orders = findUnsettledPaidOrders(waterFormIds);
             if (orders.isEmpty()) {
                 return;
@@ -108,7 +113,11 @@ public class DealerOrderSettlement10584Task {
             // Per-run caches to reduce DB chatter across orders.
             Map<Integer, Integer> level1ParentCache = new HashMap<>();
             Map<Integer, Boolean> shopRoleCache = new HashMap<>();
+
+            //获取系统设置分销等级
             DealerBasicSetting dealerBasicSetting = findDealerBasicSetting();
+
+            //获取分销员type=2第一个分销人作为平台总分红人
             ShopDealerUser totalDealerUser = findTotalDealerUser();
             if (totalDealerUser == null || totalDealerUser.getUserId() == null) {
                 log.warn("未找到分红账号，订单仍可结算但不会发放分红 - tenantId={}", TENANT_ID);
@@ -124,6 +133,7 @@ public class DealerOrderSettlement10584Task {
                 try {
                     transactionTemplate.executeWithoutResult(status -> {
                         // 先“认领”订单：并发/多实例下避免重复结算（update=0 表示被其他线程/实例处理）
+                        //更新商品订单为已结算状态
                         if (!claimOrderToSettle(order.getOrderId(), waterFormIds)) {
                             return;
                         }
@@ -138,6 +148,88 @@ public class DealerOrderSettlement10584Task {
         }
     }
 
+    /**
+     * 每10分钟执行一次。
+     */
+    @Scheduled(cron = "0 0/10 * * * ?")
+    @IgnoreTenant("该定时任务仅处理租户10584，但需要显式按tenantId过滤，避免定时任务线程无租户上下文导致查询异常")
+    public void settleTenant10584OrdersV2() {
+        try {
+            //获取水票模板对应的商品信息列表
+            Set<Integer> waterFormIds = loadWaterFormIds();
+
+            //查询商品列表存在已支付未核销订单数据【isSettled = 0， payStatus= 1， orderStatus 不在列表（2, 3, 4, 5, 6, 7）】
+            List<ShopOrder> orders = findUnsettledPaidOrders(waterFormIds);
+            if (orders.isEmpty()) {
+                return;
+            }
+
+            // Per-run caches to reduce DB chatter across orders.
+            Map<Integer, Integer> level1ParentCache = new HashMap<>();
+            Map<Integer, Boolean> shopRoleCache = new HashMap<>();
+
+            //获取系统设置分销等级
+            DealerBasicSetting dealerBasicSetting = findDealerBasicSetting();
+
+            //获取分销员type=2第一个分销人作为平台总分红人
+            ShopDealerUser totalDealerUser = findTotalDealerUser();
+            if (totalDealerUser == null || totalDealerUser.getUserId() == null) {
+                log.warn("未找到分红账号，订单仍可结算但不会发放分红 - tenantId={}", TENANT_ID);
+            }
+            log.debug("租户{}分销设置 - level={}", TENANT_ID, dealerBasicSetting.level);
+
+            log.info("租户{}待结算订单数: {}, orderNos(sample)={}",
+                    TENANT_ID,
+                    orders.size(),
+                    orders.stream().limit(10).map(ShopOrder::getOrderNo).toList());
+
+            for (ShopOrder order : orders) {
+                try {
+                    transactionTemplate.executeWithoutResult(status -> {
+                        // 先“认领”订单：并发/多实例下避免重复结算（update=0 表示被其他线程/实例处理）
+                        //更新商品订单为已结算状态
+                        if (!claimOrderToSettle(order.getOrderId(), waterFormIds)) {
+                            return;
+                        }
+                        settleOneOrderV2(order, level1ParentCache, shopRoleCache, totalDealerUser, dealerBasicSetting.level);
+                    });
+                } catch (Exception e) {
+                    log.error("订单结算失败，将回滚本订单并在下次任务重试 - orderId={}, orderNo={}", order.getOrderId(), order.getOrderNo(), e);
+                }
+            }
+        } catch (Exception e) {
+            log.error("租户{}分销订单结算任务执行失败", TENANT_ID, e);
+        }
+    }
+
+    /**
+     * 订单分销金、分润金结算
+     */
+    @Transactional
+    public void orderSettlement(String orderNo){
+        LambdaQueryWrapper<ShopOrder> orderLambdaQueryWrapper = new LambdaQueryWrapper<ShopOrder>().eq(ShopOrder::getOrderNo, orderNo).eq(ShopOrder::getIsSettled, 0).eq(ShopOrder::getPayStatus, 1);
+        ShopOrder order = shopOrderService.getOne(orderLambdaQueryWrapper);
+        if(order != null){
+            //获取系统设置分销等级
+            DealerBasicSetting dealerBasicSetting = findDealerBasicSetting();
+
+            //获取分销员type=2第一个分销人作为平台总分红人
+            ShopDealerUser totalDealerUser = findTotalDealerUser();
+
+            Map<Integer, Integer> level1ParentCache = new HashMap<>();
+            Map<Integer, Boolean> shopRoleCache = new HashMap<>();
+
+            transactionTemplate.executeWithoutResult(status -> {
+                // 先“认领”订单：并发/多实例下避免重复结算（update=0 表示被其他线程/实例处理）
+                //更新商品订单为已结算状态
+                if (!claimOrderToSettleV2(order.getOrderId())) {
+                    return;
+                }
+                settleOneOrderV2(order, level1ParentCache, shopRoleCache, totalDealerUser, dealerBasicSetting.level);
+            });
+        }
+    }
+
     private List<ShopOrder> findUnsettledPaidOrders(Set<Integer> waterFormIds) {
         // 租户10584约定：
         // - 普通订单：以发货为准（deliveryStatus=20）才结算；
@@ -148,7 +240,7 @@ public class DealerOrderSettlement10584Task {
             .eq(ShopOrder::getPayStatus, true)
             .eq(ShopOrder::getIsSettled, 0)
             // 退款/取消订单不结算，避免“退款后仍发放分红/分润/佣金”
-            .and(w -> w.notIn(ShopOrder::getOrderStatus, 2, 4, 5, 6, 7).or().isNull(ShopOrder::getOrderStatus));
+            .and(w -> w.notIn(ShopOrder::getOrderStatus, 2, 3, 4, 5, 6, 7).or().isNull(ShopOrder::getOrderStatus));
 
         if (waterFormIds != null && !waterFormIds.isEmpty()) {
             qw.and(w -> w.eq(ShopOrder::getDeliveryStatus, 20).or().in(ShopOrder::getFormId, waterFormIds));
@@ -178,6 +270,17 @@ public class DealerOrderSettlement10584Task {
         return shopOrderService.update(uw);
     }
 
+    private boolean claimOrderToSettleV2(Integer orderId) {
+        LambdaUpdateWrapper<ShopOrder> uw = new LambdaUpdateWrapper<ShopOrder>()
+                .eq(ShopOrder::getOrderId, orderId)
+                .eq(ShopOrder::getTenantId, TENANT_ID)
+                .eq(ShopOrder::getIsSettled, 0)
+                // 二次防御：退款/取消订单不允许被“认领结算”
+                .and(w -> w.notIn(ShopOrder::getOrderStatus, 2, 3, 4, 5, 6, 7).or().isNull(ShopOrder::getOrderStatus));
+        uw.set(ShopOrder::getIsSettled, 1);
+        return shopOrderService.update(uw);
+    }
+
     private Set<Integer> loadWaterFormIds() {
         try {
             return gltTicketTemplateService.list(
@@ -252,6 +355,45 @@ public class DealerOrderSettlement10584Task {
         log.info("订单结算完成 - orderId={}, orderNo={}, baseAmount={}", order.getOrderId(), order.getOrderNo(), baseAmount);
     }
 
+    private void settleOneOrderV2(ShopOrder order, Map<Integer, Integer> level1ParentCache, Map<Integer, Boolean> shopRoleCache,
+                                  ShopDealerUser totalDealerUser, int dealerLevel) {
+        if (order.getUserId() == null || order.getOrderNo() == null) {
+            throw new IllegalStateException("订单关键信息缺失，无法结算 - orderId=" + order.getOrderId());
+        }
+
+        BigDecimal totalPrice = order.getTotalPrice();
+        BigDecimal payPrice = order.getPayPrice();
+        BigDecimal rate = payPrice.divide(totalPrice, 2, RoundingMode.HALF_UP);
+
+        if(payPrice.compareTo(BigDecimal.ZERO) <= 0){
+            log.info("订单号：{}，实付金额为0，无需执行分销逻辑" + order.getOrderNo());
+            return;
+        }
+
+        //查询订单号订单所有已开启分销的商品分润信息
+        List<ShopOrderGoodsVO> orderGoodsVOList = shopOrderMapper.getOrderGoodsInfo(order.getOrderNo());
+        if(CollectionUtils.isNotEmpty(orderGoodsVOList)){
+            // 1) 直推/间推（直接增加冻结账户余额）
+            DealerRefereeCommissionV2 dealerRefereeCommission = settleDealerRefereeCommissionV2(order, rate, orderGoodsVOList, dealerLevel);
+
+            // 2) 门店分润上级：从下单用户开始逐级向上找，命中 ShopDealerUser.type=1 的最近两级（直推门店/间推门店）【只统计数据，不对分销账户进行处理，
+            // 已日结形式，统计分销记录表：shop_dealer_order 做对应一级二级管理津贴结算】
+            ShopRoleCommission shopRoleCommission = settleShopRoleRefereeCommissionV2(order, rate, orderGoodsVOList, level1ParentCache, shopRoleCache);
+
+            // 3) 分红：固定比率，每个订单都分 TODO 总分红未开发，还按原逻辑走
+            int goodsQty = orderGoodsVOList.stream().mapToInt(ShopOrderGoodsVO::getTotalNum).sum();
+            TotalDealerCommission totalDealerCommission = settleTotalDealerCommissionV2(order, goodsQty, totalDealerUser);
+
+            // 4) 写入分销订单记录（用于排查/统计；详细分佣以 ShopDealerCapital 为准）
+            createDealerOrderRecordV2(order, dealerRefereeCommission, shopRoleCommission, totalDealerCommission);
+
+            log.info("订单结算完成 - orderId={}, orderNo={}, baseAmount={}", order.getOrderId(), order.getOrderNo(), payPrice);
+        }else {
+           log.error("订单号：{}，未找到下单分销商品数据！", order.getOrderNo());
+           return;
+        }
+    }
+
     private DealerRefereeCommission settleDealerRefereeCommission(
         ShopOrder order,
         BigDecimal baseAmount,
@@ -329,6 +471,92 @@ public class DealerOrderSettlement10584Task {
         return new DealerRefereeCommission(directDealerId, directMoney, simpleDealerId, simpleMoney, thirdDealerId, thirdMoney);
     }
 
+    /**
+     * 获取分销员分销霍金数据
+     * @param order
+     * @param orderGoodsVOList
+     * @param dealerLevel
+     * @return
+     */
+    private DealerRefereeCommissionV2 settleDealerRefereeCommissionV2(ShopOrder order, BigDecimal rate, List<ShopOrderGoodsVO> orderGoodsVOList, int dealerLevel) {
+        Integer directDealerId = null;
+        Integer simpleDealerId = null;
+        AtomicReference<BigDecimal> directMoney = new AtomicReference<>(BigDecimal.ZERO);
+        AtomicReference<BigDecimal> simpleMoney = new AtomicReference<>(BigDecimal.ZERO);
+
+
+        ShopDealerRefereeVO dealerRefereeVO = shopDealerRefereeMapper.getDealerIdByUserId(order.getUserId());
+        if (dealerLevel == 1) {
+            Integer directUserId = dealerRefereeVO.getDirectUserId();
+            Integer directUserType = dealerRefereeVO.getDirectUserType();
+            if(directUserId != null && directUserType != null && directUserType == 0){
+                directDealerId = dealerRefereeVO.getDirectUserId();
+            }
+        }else {
+            Integer directUserId = dealerRefereeVO.getDirectUserId();
+            Integer directUserType = dealerRefereeVO.getDirectUserType();
+            Integer simpleUserId = dealerRefereeVO.getSimpleUserId();
+            Integer simpleUserType = dealerRefereeVO.getSimpleUserType();
+            if(directUserId != null && directUserType != null && directUserType == 0){
+                directDealerId = directUserId;
+            }
+            if(simpleUserId != null && simpleUserType != null && simpleUserType == 0){
+                simpleDealerId = simpleUserId;
+            }
+        }
+
+        if(directDealerId != null || simpleDealerId != null){
+            Integer finalDirectDealerId = directDealerId;
+            Integer finalSimpleDealerId = simpleDealerId;
+            orderGoodsVOList.forEach(orderGoodsVO -> {
+                //获取商品分润比例/金额
+                BigDecimal firstMoney = orderGoodsVO.getFirstMoney();
+                BigDecimal secondMoney = orderGoodsVO.getSecondMoney();
+
+                //按实付比例计算单项应参与分润金额
+                BigDecimal itemRatePrice = orderGoodsVO.getPrice().multiply(BigDecimal.valueOf(orderGoodsVO.getTotalNum())).multiply(rate);
+
+                //一级分销员存在(type = 0)且单项实付金额大于0及商品设置了一级分销比例/金额
+                if(finalDirectDealerId != null && itemRatePrice.compareTo(BigDecimal.ZERO) > 0 && firstMoney.compareTo(BigDecimal.ZERO) > 0){
+                    BigDecimal one = calcMoneyByCommissionType(itemRatePrice, firstMoney, orderGoodsVO.getTotalNum(), 2, orderGoodsVO.getCommissionType());
+                    directMoney.accumulateAndGet(one, BigDecimal::add);
+                }
+
+                //一级分销员存在(type = 0)且单项实付金额大于0及商品设置了一级分销比例/金额
+                if(finalSimpleDealerId != null && itemRatePrice.compareTo(BigDecimal.ZERO) > 0 && secondMoney.compareTo(BigDecimal.ZERO) > 0 ){
+                    BigDecimal two = calcMoneyByCommissionType(itemRatePrice, secondMoney, orderGoodsVO.getTotalNum(), 2, orderGoodsVO.getCommissionType());
+                    simpleMoney.accumulateAndGet(two, BigDecimal::add);
+                }
+            });
+
+            //一级分销员账户增加冻结金额
+            if (directDealerId != null && directMoney.get().compareTo(BigDecimal.ZERO) > 0) {
+                ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto();
+                reduceDto.setTypeEnum(ShopDealerTypeEnum.FREEZE_ACCOUNT);
+                reduceDto.setUserId(directDealerId);
+                reduceDto.setOrderUserId(order.getUserId());
+                reduceDto.setOrderNo(order.getOrderNo());
+                reduceDto.setPrice(directMoney.get());
+                reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.DISTRIBUTION_INCOME);
+                shopDealerUserService.reduceBalance(reduceDto);
+            }
+
+            //二级分销员账户增加冻结金额
+            if (simpleDealerId != null && simpleMoney.get().compareTo(BigDecimal.ZERO) > 0) {
+                ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto();
+                reduceDto.setTypeEnum(ShopDealerTypeEnum.FREEZE_ACCOUNT);
+                reduceDto.setUserId(simpleDealerId);
+                reduceDto.setOrderUserId(order.getUserId());
+                reduceDto.setOrderNo(order.getOrderNo());
+                reduceDto.setPrice(simpleMoney.get());
+                reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.DISTRIBUTION_INCOME);
+                shopDealerUserService.reduceBalance(reduceDto);
+            }
+            return new DealerRefereeCommissionV2(directDealerId, directMoney.get(), simpleDealerId, simpleMoney.get());
+        }
+        return null;
+    }
+
     private Integer getDealerRefereeId(Integer userId) {
         return getDealerRefereeId(userId, 1);
     }
@@ -412,6 +640,54 @@ public class DealerOrderSettlement10584Task {
         return new ShopRoleCommission(shopRoleReferees.get(0), storeDirectMoney, shopRoleReferees.get(1), storeSimpleMoney);
     }
 
+    private ShopRoleCommission settleShopRoleRefereeCommissionV2(ShopOrder order, BigDecimal rate, List<ShopOrderGoodsVO> orderGoodsVOList, Map<Integer, Integer> level1ParentCache, Map<Integer, Boolean> shopRoleCache) {
+        List<Integer> shopRoleReferees = findFirstTwoShopRoleReferees(order.getUserId(), level1ParentCache, shopRoleCache);
+        log.info("门店分润命中结果(type=1门店角色取前两级) - orderNo={}, buyerUserId={}, shopRoleReferees={}",
+                order.getOrderNo(), order.getUserId(), shopRoleReferees);
+        if (shopRoleReferees.isEmpty()) {
+            return ShopRoleCommission.empty();
+        }
+
+        if(CollectionUtils.isNotEmpty(shopRoleReferees)){
+            Integer storeDirectUserId;
+            Integer storeSimpleUserId = null;
+            AtomicReference<BigDecimal> storeDirectMoney = new AtomicReference<>(BigDecimal.ZERO);
+            AtomicReference<BigDecimal> storeSimpleMoney = new AtomicReference<>(BigDecimal.ZERO);
+
+            if(shopRoleReferees.size() == 1){
+                storeDirectUserId = shopRoleReferees.get(0);
+            }else {
+                storeDirectUserId = shopRoleReferees.get(0);
+                storeSimpleUserId = shopRoleReferees.get(1);
+            }
+
+
+            Integer finalStoreDirectUserId = storeDirectUserId;
+            Integer finalStoreSimpleUserId = storeSimpleUserId;
+            orderGoodsVOList.forEach(orderGoodsVO ->{
+                //获取商品对应服务商管理费分润比例/金额
+                BigDecimal firstMoney = orderGoodsVO.getFirstDividend();
+                BigDecimal secondMoney = orderGoodsVO.getSecondDividend();
+
+                //按实付比例计算单项应参与分润金额
+                BigDecimal itemRatePrice = orderGoodsVO.getPrice().multiply(BigDecimal.valueOf(orderGoodsVO.getTotalNum())).multiply(rate);
+
+                if(finalStoreDirectUserId != null && itemRatePrice.compareTo(BigDecimal.ZERO) > 0){
+                    BigDecimal one = calcMoneyByCommissionType(itemRatePrice, firstMoney, orderGoodsVO.getTotalNum(), 2, orderGoodsVO.getCommissionType());
+                    storeDirectMoney.accumulateAndGet(one, BigDecimal::add);
+                }
+
+                if(finalStoreSimpleUserId != null && itemRatePrice.compareTo(BigDecimal.ZERO) > 0){
+                    BigDecimal two = calcMoneyByCommissionType(itemRatePrice, secondMoney, orderGoodsVO.getTotalNum(), 2, orderGoodsVO.getCommissionType());
+                    storeSimpleMoney.accumulateAndGet(two, BigDecimal::add);
+                }
+            });
+            return new ShopRoleCommission(storeDirectUserId, storeDirectMoney.get(), storeSimpleUserId, storeSimpleMoney.get());
+        }else {
+            return null;
+        }
+    }
+
     private TotalDealerCommission settleTotalDealerCommission(
         ShopOrder order,
         BigDecimal baseAmount,
@@ -438,6 +714,32 @@ public class DealerOrderSettlement10584Task {
         return new TotalDealerCommission(totalDealerUser.getUserId(), money);
     }
 
+    private TotalDealerCommission settleTotalDealerCommissionV2(ShopOrder order, int goodsQty, ShopDealerUser totalDealerUser) {
+        if (totalDealerUser == null || totalDealerUser.getUserId() == null) {
+            return TotalDealerCommission.empty();
+        }
+        BigDecimal rate = safePositive(totalDealerUser.getRate());
+        if (rate.signum() <= 0) {
+            rate = TOTAL_DEALER_DIVIDEND_RATE;
+        }
+        BigDecimal money = calcMoneyByCommissionType(order.getPayPrice(), rate, goodsQty, DIVIDEND_SCALE, 20);
+
+        //一级分销员账户增加冻结金额
+        if (money.compareTo(BigDecimal.ZERO) > 0) {
+            ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto();
+            reduceDto.setTypeEnum(ShopDealerTypeEnum.FREEZE_ACCOUNT);
+            reduceDto.setUserId(totalDealerUser.getUserId());
+            reduceDto.setOrderUserId(order.getUserId());
+            reduceDto.setOrderNo(order.getOrderNo());
+            reduceDto.setPrice(money);
+            reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.DIVIDEND_INCOME);
+            shopDealerUserService.reduceBalance(reduceDto);
+
+            return new TotalDealerCommission(totalDealerUser.getUserId(), money);
+        }
+        return TotalDealerCommission.empty();
+    }
+
     private ShopDealerUser findTotalDealerUser() {
         return shopDealerUserService.getOne(
             new LambdaQueryWrapper<ShopDealerUser>()
@@ -756,6 +1058,92 @@ public class DealerOrderSettlement10584Task {
             order.getOrderNo(), dealerOrder.getFirstUserId(), dealerOrder.getSecondUserId(), dealerOrder.getFirstDividendUser(), dealerOrder.getSecondDividendUser());
     }
 
+    /**
+     * 记录订单分销业务
+     * @param order 商品订单
+     * @param dealerRefereeCommission   一级、二级分销员分销数据
+     * @param shopRoleCommission        门店/服务商一级、二级管理津贴数据
+     */
+    private void createDealerOrderRecordV2(ShopOrder order, DealerRefereeCommissionV2 dealerRefereeCommission, ShopRoleCommission shopRoleCommission, TotalDealerCommission totalDealerCommission) {
+        // 幂等：同一订单只写一条（依赖 order_no + tenant_id 作为业务唯一）
+        ShopDealerOrder existed = shopDealerOrderService.getOne(
+                new LambdaQueryWrapper<ShopDealerOrder>()
+                        .eq(ShopDealerOrder::getTenantId, TENANT_ID)
+                        .eq(ShopDealerOrder::getOrderNo, order.getOrderNo())
+                        .last("limit 1")
+        );
+        if (existed != null) {
+            // 允许“补发”门店分润时回填分润字段，避免订单已结算但分润字段一直为空，影响排查/对账。
+            LambdaUpdateWrapper<ShopDealerOrder> uw = new LambdaUpdateWrapper<ShopDealerOrder>()
+                    .eq(ShopDealerOrder::getTenantId, TENANT_ID)
+                    .eq(ShopDealerOrder::getOrderNo, order.getOrderNo());
+            boolean needUpdate = false;
+            if (shopRoleCommission != null && shopRoleCommission.storeDirectUserId != null) {
+                Integer existedUser = existed.getFirstDividendUser();
+                boolean needSetUser = existedUser == null;
+                boolean needSetMoney = existed.getFirstDividend() == null || existed.getFirstDividend().signum() == 0;
+                if (needSetUser) {
+                    uw.set(ShopDealerOrder::getFirstDividendUser, shopRoleCommission.storeDirectUserId);
+                    needUpdate = true;
+                }
+                boolean sameUser = existedUser == null || Objects.equals(existedUser, shopRoleCommission.storeDirectUserId);
+                if (sameUser && needSetMoney && shopRoleCommission.storeDirectMoney != null && shopRoleCommission.storeDirectMoney.signum() > 0) {
+                    uw.set(ShopDealerOrder::getFirstDividend, shopRoleCommission.storeDirectMoney);
+                    needUpdate = true;
+                }
+            }
+            if (shopRoleCommission != null && shopRoleCommission.storeSimpleUserId != null) {
+                Integer existedUser = existed.getSecondDividendUser();
+                boolean needSetUser = existedUser == null;
+                boolean needSetMoney = existed.getSecondDividend() == null || existed.getSecondDividend().signum() == 0;
+                if (needSetUser) {
+                    uw.set(ShopDealerOrder::getSecondDividendUser, shopRoleCommission.storeSimpleUserId);
+                    needUpdate = true;
+                }
+                boolean sameUser = existedUser == null || Objects.equals(existedUser, shopRoleCommission.storeSimpleUserId);
+                if (sameUser && needSetMoney && shopRoleCommission.storeSimpleMoney != null && shopRoleCommission.storeSimpleMoney.signum() > 0) {
+                    uw.set(ShopDealerOrder::getSecondDividend, shopRoleCommission.storeSimpleMoney);
+                    needUpdate = true;
+                }
+            }
+            if (needUpdate) {
+                shopDealerOrderService.update(uw);
+                log.info("ShopDealerOrder已存在，回填门店分润字段 - orderNo={}, firstDividendUser={}, secondDividendUser={}",
+                        order.getOrderNo(), shopRoleCommission.storeDirectUserId, shopRoleCommission.storeSimpleUserId);
+            } else {
+                log.info("ShopDealerOrder已存在，跳过写入 - orderNo={}", order.getOrderNo());
+            }
+            return;
+        }else {
+
+            ShopDealerOrder dealerOrder = new ShopDealerOrder();
+            dealerOrder.setUserId(order.getUserId()); // 买家用户ID
+            dealerOrder.setOrderNo(order.getOrderNo());
+            dealerOrder.setOrderPrice(order.getTotalPrice());
+            dealerOrder.setPayPrice(order.getPayPrice());
+
+            //一级、二级分销员分销佣金统计
+            dealerOrder.setFirstUserId(dealerRefereeCommission != null ? dealerRefereeCommission.directDealerId : null);
+            dealerOrder.setFirstMoney(dealerRefereeCommission != null ? dealerRefereeCommission.directMoney : BigDecimal.ZERO);
+            dealerOrder.setSecondUserId(dealerRefereeCommission != null ? dealerRefereeCommission.simpleDealerId : null);
+            dealerOrder.setSecondMoney(dealerRefereeCommission != null ? dealerRefereeCommission.simpleMoney : BigDecimal.ZERO);
+
+            //门店(角色shop)两级分润单独落字段（详细以 ShopDealerCapital 为准）
+            dealerOrder.setFirstDividendUser(shopRoleCommission != null ? shopRoleCommission.storeDirectUserId : null);
+            dealerOrder.setFirstDividend(shopRoleCommission != null ? shopRoleCommission.storeDirectMoney : BigDecimal.ZERO);
+            dealerOrder.setSecondDividendUser(shopRoleCommission != null ? shopRoleCommission.storeSimpleUserId : null);
+            dealerOrder.setSecondDividend(shopRoleCommission != null ? shopRoleCommission.storeSimpleMoney : BigDecimal.ZERO);
+
+            dealerOrder.setIsSettled(1);
+            dealerOrder.setSettleTime(LocalDateTime.now());
+            dealerOrder.setMonth(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM")));
+            dealerOrder.setTenantId(TENANT_ID);
+            dealerOrder.setComments(buildCommissionTraceCommentV2(dealerRefereeCommission, shopRoleCommission, totalDealerCommission));
+
+            shopDealerOrderService.save(dealerOrder);
+        }
+    }
+
     private String buildCommissionTraceComment(
         DealerRefereeCommission dealerRefereeCommission,
         ShopRoleCommission shopRoleCommission,
@@ -770,6 +1158,30 @@ public class DealerOrderSettlement10584Task {
             + ",totalDealer=" + totalDealerCommission.userId + ":" + totalDealerCommission.money;
     }
 
+    private String buildCommissionTraceCommentV2(
+            DealerRefereeCommissionV2 dealerRefereeCommission,
+            ShopRoleCommission shopRoleCommission,
+            TotalDealerCommission totalDealerCommission
+    ) {
+        // 轻量“过程”留痕，方便排查；详细分佣以 ShopDealerCapital 为准。
+        Integer direct = dealerRefereeCommission != null ? dealerRefereeCommission.directDealerId : null;
+        BigDecimal directMoney = dealerRefereeCommission != null ? dealerRefereeCommission.directMoney : BigDecimal.ZERO;
+        Integer simpleDealerId = dealerRefereeCommission != null ? dealerRefereeCommission.simpleDealerId : null;
+        BigDecimal simpleMoney = dealerRefereeCommission != null ? dealerRefereeCommission.simpleMoney : BigDecimal.ZERO;
+        Integer storeDirectUserId = shopRoleCommission != null ? shopRoleCommission.storeDirectUserId : null;
+        BigDecimal storeDirectMoney = shopRoleCommission != null ? shopRoleCommission.storeDirectMoney : BigDecimal.ZERO;
+        Integer storeSimpleUserId = shopRoleCommission != null ? shopRoleCommission.storeSimpleUserId : null;
+        BigDecimal storeSimpleMoney = shopRoleCommission != null ? shopRoleCommission.storeSimpleMoney : BigDecimal.ZERO;
+        Integer userId = totalDealerCommission != null ? totalDealerCommission.userId : null;
+        BigDecimal money = totalDealerCommission != null ? totalDealerCommission.money : BigDecimal.ZERO;
+
+        return "direct=" + direct + ":" + directMoney
+                + ",simple=" + simpleDealerId + ":" + simpleMoney
+                + ",dividend1=" + storeDirectUserId + ":" + storeDirectMoney
+                + ",dividend2=" + storeSimpleUserId + ":" + storeSimpleMoney
+                + ",totalDealer=" + userId + ":" + money;
+    }
+
     private BigDecimal getOrderBaseAmount(ShopOrder order) {
         if (order == null) {
             return null;
@@ -962,6 +1374,25 @@ public class DealerOrderSettlement10584Task {
         }
     }
 
+    private static class DealerRefereeCommissionV2 {
+        private final Integer directDealerId;
+        private final BigDecimal directMoney;
+        private final Integer simpleDealerId;
+        private final BigDecimal simpleMoney;
+
+        private DealerRefereeCommissionV2(
+                Integer directDealerId,
+                BigDecimal directMoney,
+                Integer simpleDealerId,
+                BigDecimal simpleMoney
+        ) {
+            this.directDealerId = directDealerId;
+            this.directMoney = directMoney != null ? directMoney : BigDecimal.ZERO;
+            this.simpleDealerId = simpleDealerId;
+            this.simpleMoney = simpleMoney != null ? simpleMoney : BigDecimal.ZERO;
+        }
+    }
+
     private static class ShopRoleCommission {
         private final Integer storeDirectUserId;
         private final BigDecimal storeDirectMoney;

src/main/java/com/gxwebsoft/glt/task/GltTicketIssue10584Task.java

@@ -33,7 +33,7 @@ public class GltTicketIssue10584Task {
 
     private final AtomicBoolean running = new AtomicBoolean(false);
 
-    @Scheduled(cron = "${glt.ticket.issue10584.cron:0/15 * * * * ?}")
+//    @Scheduled(cron = "${glt.ticket.issue10584.cron:0/15 * * * * ?}")
     @IgnoreTenant("定时任务无登录态，需忽略租户隔离；内部使用 tenantId=10584 精确过滤")
     public void run() {
         if (!running.compareAndSet(false, true)) {

src/main/java/com/gxwebsoft/glt/task/GltUserTicketAutoReleaseTask.java

@@ -4,18 +4,19 @@ import com.gxwebsoft.common.core.annotation.IgnoreTenant;
 import com.gxwebsoft.glt.service.GltUserTicketAutoReleaseService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import java.time.LocalDateTime;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
- * 冻结水票自动释放任务：
- * - 扫描 glt_user_ticket_release 中到期且待释放（status=0）的记录
- * - 释放成功：frozen -> available，并将 release.status 置为 1
+ * 冻结水票自动释放任务：每月1日凌晨1-3点每2分钟执行一次任务
+ * - 扫描 glt_user_ticket_release 中本月到期且待释放（status=0）的记录
+ * - 释放成功：
+ *      1.修改水票释放任务为已释放状态                  glt_user_ticket_release
+ *      2.修改个人水票中：可用数量、冻结数量、已释放数量   glt_user_ticket
+ *      3.同步生产水票释放记录数据                     glt_user_ticket_log
  */
 @Slf4j
 @Component
@@ -25,25 +26,17 @@ public class GltUserTicketAutoReleaseTask {
 
     private final GltUserTicketAutoReleaseService autoReleaseService;
 
-    @Value("${glt.ticket.auto-release.batch-size:200}")
-    private int batchSize;
-
     private final AtomicBoolean running = new AtomicBoolean(false);
 
-    @Scheduled(cron = "${glt.ticket.auto-release.cron:0 */10 * * * ?}")
+    @Scheduled(cron = "${glt.ticket.auto-release.cron:0 */2 1-3 1 * ?}")
     @IgnoreTenant("定时任务无登录态，需忽略租户隔离；释放记录自带 tenantId，更新时会校验 tenantId")
     public void run() {
         if (!running.compareAndSet(false, true)) {
             log.warn("冻结水票自动释放任务仍在执行中，本轮跳过");
             return;
         }
-
         try {
-            LocalDateTime now = LocalDateTime.now();
-            int released = autoReleaseService.releaseDue(now, Math.max(batchSize, 1));
-            if (released > 0) {
-                log.info("冻结水票自动释放完成 - released={}, now={}", released, now);
-            }
+            autoReleaseService.releaseTask();
         } finally {
             running.set(false);
         }

src/main/java/com/gxwebsoft/shop/controller/ShopDealerCapitalController.java

@@ -1,17 +1,17 @@
 package com.gxwebsoft.shop.controller;
 
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.web.ApiResult;
 import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.shop.service.ShopDealerCapitalService;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.entity.User;
 import com.gxwebsoft.shop.entity.ShopDealerCapital;
 import com.gxwebsoft.shop.param.ShopDealerCapitalParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.shop.service.ShopDealerCapitalService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springdoc.api.annotations.ParameterObject;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -34,7 +34,7 @@ public class ShopDealerCapitalController extends BaseController {
     @PreAuthorize("hasAuthority('shop:shopDealerCapital:list')")
     @Operation(summary = "分页查询分销商资金明细表")
     @GetMapping("/page")
-    public ApiResult<PageResult<ShopDealerCapital>> page(ShopDealerCapitalParam param) {
+    public ApiResult<PageResult<ShopDealerCapital>> page(@ParameterObject ShopDealerCapitalParam param) {
         // 使用关联查询
         return success(shopDealerCapitalService.pageRel(param));
     }

src/main/java/com/gxwebsoft/shop/controller/ShopDealerRefereeController.java

@@ -1,19 +1,19 @@
 package com.gxwebsoft.shop.controller;
 
-import com.gxwebsoft.common.core.web.BaseController;
 import com.gxwebsoft.common.core.Constants;
+import com.gxwebsoft.common.core.annotation.OperationLog;
 import com.gxwebsoft.common.core.exception.BusinessException;
-import com.gxwebsoft.shop.service.ShopDealerRefereeService;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.entity.User;
 import com.gxwebsoft.shop.entity.ShopDealerReferee;
 import com.gxwebsoft.shop.param.ShopDealerRefereeParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
-import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.shop.service.ShopDealerRefereeService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springdoc.api.annotations.ParameterObject;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -41,6 +41,13 @@ public class ShopDealerRefereeController extends BaseController {
         return success(shopDealerRefereeService.pageRel(param));
     }
 
+    @PreAuthorize("hasAuthority('shop:shopDealerReferee:list')")
+    @Operation(summary = "分页查询分销商推荐关系表")
+    @GetMapping("/appPage")
+    public ApiResult<PageResult<ShopDealerReferee>> appPage(@ParameterObject ShopDealerRefereeParam param) {
+        return success(shopDealerRefereeService.appPage(param));
+    }
+
     @PreAuthorize("hasAuthority('shop:shopDealerReferee:list')")
     @Operation(summary = "查询全部分销商推荐关系表")
     @GetMapping()

src/main/java/com/gxwebsoft/shop/controller/ShopDealerUserController.java

@@ -4,18 +4,18 @@ import cn.afterturn.easypoi.excel.ExcelImportUtil;
 import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.utils.JSONUtil;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.shop.service.ShopDealerUserService;
-import com.gxwebsoft.shop.entity.ShopDealerUser;
-import com.gxwebsoft.shop.param.ShopDealerUserParam;
-import com.gxwebsoft.shop.param.ShopDealerUserImportParam;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.BatchParam;
 import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.utils.JSONUtil;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto;
+import com.gxwebsoft.shop.entity.ShopDealerUser;
+import com.gxwebsoft.shop.param.ShopDealerUserImportParam;
+import com.gxwebsoft.shop.param.ShopDealerUserParam;
+import com.gxwebsoft.shop.service.ShopDealerUserService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -178,4 +178,11 @@ public class ShopDealerUserController extends BaseController {
         return fail("导入失败", null);
     }
 
+    @Operation(summary = "分销结算")
+    @PostMapping("/dealerCapital")
+    @Deprecated
+    public ApiResult<?> dealerCapital(@RequestBody ShopDealerUserReduceDto reduceDto) {
+        return success(shopDealerUserService.reduceBalance(reduceDto));
+    }
+
 }

src/main/java/com/gxwebsoft/shop/controller/ShopDealerWithdrawController.java

@@ -2,6 +2,7 @@ package com.gxwebsoft.shop.controller;
 
 import cn.hutool.core.util.StrUtil;
 import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.system.redis.OrderNoUtils;
 import com.gxwebsoft.shop.entity.ShopDealerUser;
 import com.gxwebsoft.shop.service.ShopDealerUserService;
 import com.gxwebsoft.shop.service.ShopDealerWithdrawService;
@@ -43,6 +44,8 @@ public class ShopDealerWithdrawController extends BaseController {
     private ShopDealerUserService shopDealerUserService;
     @Resource
     private WxTransferService wxTransferService;
+    @Resource
+    private OrderNoUtils orderNoUtils;
 
     @PreAuthorize("hasAuthority('shop:shopDealerWithdraw:list')")
     @Operation(summary = "分页查询分销商提现明细表")
@@ -89,6 +92,8 @@ public class ShopDealerWithdrawController extends BaseController {
                 return fail("tenantId为空，无法发起提现");
             }
 
+            String orderNo = orderNoUtils.generate("WD");
+            shopDealerWithdraw.setOrderNo(orderNo);
             shopDealerWithdraw.setTenantId(tenantId);
             shopDealerWithdraw.setUserId(loginUser.getUserId());
 

src/main/java/com/gxwebsoft/shop/controller/ShopOrderController.java

@@ -5,41 +5,39 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.common.core.config.ConfigProperties;
 import com.gxwebsoft.common.core.config.CertificateProperties;
-import com.gxwebsoft.common.core.utils.RedisUtil;
+import com.gxwebsoft.common.core.config.ConfigProperties;
 import com.gxwebsoft.common.core.utils.CertificateLoader;
+import com.gxwebsoft.common.core.utils.RedisUtil;
 import com.gxwebsoft.common.core.utils.WechatCertAutoConfig;
 import com.gxwebsoft.common.core.utils.WechatPayConfigValidator;
+import com.gxwebsoft.common.core.web.ApiResult;
 import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.BatchParam;
+import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.Payment;
+import com.gxwebsoft.common.system.entity.User;
 import com.gxwebsoft.glt.service.GltTicketIssueService;
-import com.gxwebsoft.shop.entity.ShopOrderDelivery;
-import com.gxwebsoft.shop.entity.ShopUserAddress;
-import com.gxwebsoft.shop.service.*;
 import com.gxwebsoft.glt.service.GltTicketRevokeService;
-import com.gxwebsoft.shop.service.impl.KuaiDi100Impl;
-import com.gxwebsoft.shop.task.OrderAutoCancelTask;
-import com.gxwebsoft.shop.entity.ShopOrder;
-import com.gxwebsoft.shop.param.ShopOrderParam;
-import com.gxwebsoft.shop.dto.OrderCreateRequest;
-import com.gxwebsoft.shop.dto.OrderPrepayRequest;
-import com.gxwebsoft.shop.dto.UpdatePaymentStatusRequest;
-import com.gxwebsoft.payment.service.PaymentService;
 import com.gxwebsoft.payment.dto.PaymentResponse;
 import com.gxwebsoft.payment.enums.PaymentType;
-import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
-import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.payment.service.PaymentService;
+import com.gxwebsoft.shop.dto.*;
+import com.gxwebsoft.shop.entity.ShopOrder;
+import com.gxwebsoft.shop.entity.ShopOrderDelivery;
+import com.gxwebsoft.shop.entity.ShopUserAddress;
+import com.gxwebsoft.shop.param.ShopOrderParam;
+import com.gxwebsoft.shop.service.*;
+import com.gxwebsoft.shop.service.impl.KuaiDi100Impl;
+import com.gxwebsoft.shop.task.OrderAutoCancelTask;
+import com.wechat.pay.java.core.RSAAutoCertificateConfig;
 import com.wechat.pay.java.core.notification.NotificationConfig;
 import com.wechat.pay.java.core.notification.NotificationParser;
 import com.wechat.pay.java.core.notification.RequestParam;
-import com.wechat.pay.java.core.RSAAutoCertificateConfig;
 import com.wechat.pay.java.service.payments.model.Transaction;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.tags.Tag;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
@@ -136,14 +134,13 @@ public class ShopOrderController extends BaseController {
         return success(shopOrderService.getByIdRel(id));
     }
 
-    @Operation(summary = "添加订单")
+    @Operation(summary = "添加订单【单商品添加】")
     @PostMapping()
     public ApiResult<?> save(@RequestBody OrderCreateRequest request) {
         User loginUser = getLoginUser();
         if (loginUser == null) {
             return fail("用户未登录");
         }
-
         try {
             Map<String, String> wxOrderInfo = orderBusinessService.createOrder(request, loginUser);
             return success("下单成功", wxOrderInfo);
@@ -938,8 +935,8 @@ public class ShopOrderController extends BaseController {
                     // 更新订单状态并处理支付成功后的业务逻辑（包括累加商品销量）
                     shopOrderService.updateByOutTradeNo(order);
 
-//                    //支付成功执行一步任务
-//                    gltTicketIssueService.paySuccessExecute(order.getOrderNo(), tenantId);
+                    //支付成功执行异步任务
+                    gltTicketIssueService.paySuccessTask(order.getOrderNo(), tenantId);
 
                     return "SUCCESS";
                 }
@@ -961,6 +958,19 @@ public class ShopOrderController extends BaseController {
         return "fail";
     }
 
+    @Operation(summary = "核销订单", description = "核销员扫码核销用户订单")
+    @PutMapping("/verifyOrder")
+    public ApiResult<Boolean> verifyOrder(@RequestBody VerifyShopOrderDto verifyDto){
+        return success(shopOrderService.verifyOrder(verifyDto));
+    }
+
+    @Operation(summary = "支付成功任务", description = "用户支付成功后执行任务")
+    @PutMapping("/paySuccessTask")
+    public ApiResult<Boolean> paySuccessTask(@RequestBody PaySuccessTaskDto taskDto){
+        gltTicketIssueService.paySuccessTask(taskDto.getOrderNo(), taskDto.getTenantId());
+        return success(Boolean.TRUE);
+    }
+
     @Operation(summary = "更新订单支付状态", description = "用户支付成功后主动同步订单状态")
     @PutMapping("/payment-status")
     public ApiResult<?> updateOrderPaymentStatus(@RequestBody UpdatePaymentStatusRequest request) {

src/main/java/com/gxwebsoft/shop/controller/ShopSurchargeConfigController.java

@@ -0,0 +1,88 @@
+package com.gxwebsoft.shop.controller;
+
+import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.web.ApiResult;
+import com.gxwebsoft.common.core.web.BaseController;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.shop.entity.ShopSurchargeConfig;
+import com.gxwebsoft.shop.param.ShopSurchargeConfigParam;
+import com.gxwebsoft.shop.service.ShopSurchargeConfigService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+/**
+ * 步梯费用设置控制器
+ *
+ * @author xm
+ * @since 2026-04-28 16:30:00
+ */
+@Tag(name = "步梯费用设置管理")
+@RestController
+@RequestMapping("/api/shop/shop-surcharge-config")
+public class ShopSurchargeConfigController extends BaseController {
+    @Resource
+    private ShopSurchargeConfigService shopSurchargeConfigService;
+
+//    @PreAuthorize("hasAuthority('shop:shopSurchargeConfig:list')")
+    @Operation(summary = "分页查询步梯费用设置")
+    @GetMapping("/page")
+    public ApiResult<PageResult<ShopSurchargeConfig>> page(ShopSurchargeConfigParam param) {
+        // 使用关联查询
+        return success(shopSurchargeConfigService.pageRel(param));
+    }
+
+//    @PreAuthorize("hasAuthority('shop:shopSurchargeConfig:list')")
+    @Operation(summary = "根据id查询步梯费用设置")
+    @GetMapping("/{id}")
+    public ApiResult<ShopSurchargeConfig> get(@PathVariable("id") Integer id) {
+        // 使用关联查询
+        return success(shopSurchargeConfigService.getByIdRel(id));
+    }
+
+//    @PreAuthorize("hasAuthority('shop:shopSurchargeConfig:list')")
+    @Operation(summary = "根据类型查询步梯费用设置")
+    @GetMapping("/getInfoByType")
+    public ApiResult<ShopSurchargeConfig> getInfoByType(@RequestParam Integer type) {
+        // 使用关联查询
+        return success(shopSurchargeConfigService.getInfoByType(type));
+    }
+
+//    @PreAuthorize("hasAuthority('shop:shopSurchargeConfig:save')")
+    @OperationLog
+    @Operation(summary = "添加步梯费用设置")
+    @PostMapping()
+    public ApiResult<Integer> save(@RequestBody ShopSurchargeConfig shopSurchargeConfig) {
+        return success(shopSurchargeConfigService.saveInfo(shopSurchargeConfig));
+    }
+
+//    @PreAuthorize("hasAuthority('shop:shopSurchargeConfig:update')")
+    @OperationLog
+    @Operation(summary = "修改步梯费用设置")
+    @PutMapping()
+    public ApiResult<Boolean> update(@RequestBody ShopSurchargeConfig shopSurchargeConfig) {
+        return success(shopSurchargeConfigService.updateInfo(shopSurchargeConfig));
+    }
+
+//    @PreAuthorize("hasAuthority('shop:shopSurchargeConfig:update')")
+    @OperationLog
+    @Operation(summary = "修改步梯费用设置")
+    @PutMapping("/updateStatus")
+    public ApiResult<Boolean> updateStatus(@RequestParam("id") Integer id) {
+        return success(shopSurchargeConfigService.updateStatus(id));
+    }
+
+    //    @PreAuthorize("hasAuthority('shop:shopSurchargeConfig:remove')")
+    @OperationLog
+    @Operation(summary = "删除步梯费用设置")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (shopSurchargeConfigService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

src/main/java/com/gxwebsoft/shop/controller/ShopUserAddressController.java

@@ -79,11 +79,8 @@
         @OperationLog
         @Operation(summary = "修改收货地址")
         @PutMapping()
-        public ApiResult<?> update(@RequestBody ShopUserAddress shopUserAddress) {
-            if (shopUserAddressService.updateById(shopUserAddress)) {
-                return success("修改成功");
-            }
-            return fail("修改失败");
+        public ApiResult<Boolean> update(@RequestBody ShopUserAddress shopUserAddress) {
+            return success(shopUserAddressService.updateInfo(shopUserAddress));
         }
 
         @PreAuthorize("hasAuthority('shop:shopUserAddress:remove')")

src/main/java/com/gxwebsoft/shop/dto/OrderCreateRequest.java

@@ -27,6 +27,9 @@ public class OrderCreateRequest {
     @Max(value = 2, message = "订单类型值无效")
     private Integer type;
 
+    @Schema(description = "订单类型 1-及时自配送 2-自提 3-预约自配送 4-发快递 5-配送【系统自动识别电子围栏内转及时配送，电子围栏外发快递】")
+    private Integer orderType;
+
     @Size(max = 60, message = "备注长度不能超过60个字符")
     @Schema(description = "订单标题")
     private String title;

src/main/java/com/gxwebsoft/shop/dto/PaySuccessTaskDto.java

@@ -0,0 +1,25 @@
+package com.gxwebsoft.shop.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 支付成功执行请求类
+ *
+ * @author xm
+ * @since 2026-05-04
+ */
+@Data
+@Schema(name = "PaySuccessTaskDto", description = "支付成功执行请求类")
+public class PaySuccessTaskDto {
+
+    @Schema(description = "订单号")
+    @NotBlank(message = "订单号不能为空")
+    private String orderNo;
+
+    @Schema(description = "租户ID", example = "10584")
+    private Integer tenantId;
+
+}

src/main/java/com/gxwebsoft/shop/dto/ShopDealerUserReduceDto.java

@@ -0,0 +1,42 @@
+package com.gxwebsoft.shop.dto;
+
+import com.gxwebsoft.common.core.enums.ShopDealerCapitalUpdateEnum;
+import com.gxwebsoft.common.core.enums.ShopDealerTypeEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * 更新分销用户资金
+ * @author xm
+ * @since 2026-05-06
+ */
+@Data
+@Schema(name = "ShopDealerUserReduceDto", description = "更新分销用户资金请求")
+public class ShopDealerUserReduceDto {
+
+    @Schema(description = "变动类型 1-操作冻结账户余额 2-操作提现账户余额【直接结算】 3-解冻")
+    @NotNull(message = "变更类型不可为空！")
+    private ShopDealerTypeEnum typeEnum;
+
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+    @Schema(description = "订单主体用户ID")
+    private Integer orderUserId;
+
+    @Schema(description = "订单号")
+    @NotEmpty(message = "订单号不能为空！")
+    private String orderNo;
+
+    @Schema(description = "变更金额")
+    private BigDecimal price;
+
+    @Schema(description = "业务类型")
+    @NotEmpty(message = "业务类型不能为空！")
+    private ShopDealerCapitalUpdateEnum updateEnum;
+
+}

src/main/java/com/gxwebsoft/shop/dto/VerifyShopOrderDto.java

@@ -0,0 +1,25 @@
+package com.gxwebsoft.shop.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * 更新订单支付状态请求DTO
+ *
+ * @author xm
+ * @since 2026-05-04
+ */
+@Data
+@Schema(name = "VerifyShopOrderDto", description = "更新订单支付状态请求")
+public class VerifyShopOrderDto {
+
+    @Schema(description = "核销码")
+    @NotBlank(message = "核销码不能为空")
+    private String verifyCode;
+
+    @Schema(description = "核销码类型 1-普通核销【无推广佣金】 2-推广结算【有订单佣金】", example = "2")
+    private Integer verifyType;
+
+}

src/main/java/com/gxwebsoft/shop/entity/ShopDealerCapital.java

@@ -1,10 +1,11 @@
 package com.gxwebsoft.shop.entity;
 
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.time.LocalDateTime;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.io.Serializable;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -20,6 +21,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Schema(name = "ShopDealerCapital对象", description = "分销商资金明细表")
+@TableName("shop_dealer_capital")
 public class ShopDealerCapital implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -27,26 +29,41 @@ public class ShopDealerCapital implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    @Schema(description = "订单编号")
+    private String no;
+
     @Schema(description = "分销商用户ID")
     private Integer userId;
 
+    @Schema(description = "变动类型 1-操作冻结账户余额 2-操作提现账户余额【直接结算】 3-解冻")
+    private Integer type;
+
     @Schema(description = "分销商昵称")
     @TableField(exist = false)
     private String nickName;
 
-    @Schema(description = "订单编号")
+    @Schema(description = "关联订单编号")
     private String orderNo;
 
     @Schema(description = "订单状态")
     @TableField(exist = false)
     private Integer orderStatus;
 
-    @Schema(description = "资金流动类型 (10佣金收入 20提现支出 30转账支出 40转账收入 50佣金解冻 60配送奖励)")
+    @Schema(description = "资金流动类型 (10佣金收入 20提现支出 30转账支出 40转账收入 50佣金解冻 60配送奖励 70佣金退回【退单】)")
     private Integer flowType;
 
-    @Schema(description = "金额")
+    @Schema(description = "变更金额")
     private BigDecimal money;
 
+    @Schema(description = "变更后金额")
+    private BigDecimal moneyAfter;
+
+    @Schema(description = "变更冻结金额")
+    private BigDecimal freezeMoney;
+
+    @Schema(description = "变更冻结后金额")
+    private BigDecimal freezeMoneyAfter;
+
     @Schema(description = "描述")
     private String comments;
 
@@ -63,6 +80,9 @@ public class ShopDealerCapital implements Serializable {
     @Schema(description = "商城ID")
     private Integer tenantId;
 
+    @Schema(description = "创建人")
+    private Integer creator;
+
     @Schema(description = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
@@ -71,4 +91,8 @@ public class ShopDealerCapital implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
+    @Schema(description = "是否删除 0-未删 1-已删")
+    @TableLogic
+    private Integer deleted;
+
 }

src/main/java/com/gxwebsoft/shop/entity/ShopDealerOrder.java

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.io.Serializable;
 
@@ -23,6 +25,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Schema(name = "ShopDealerOrder对象", description = "分销商订单记录表")
+@TableName("shop_dealer_order")
 public class ShopDealerOrder implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -66,6 +69,9 @@ public class ShopDealerOrder implements Serializable {
     @TableField(exist = false)
     private String firstNickname;
 
+    @Schema(description = "分销佣金(一级)")
+    private BigDecimal firstMoney;
+
     @Schema(description = "分销商用户id(二级)")
     private Integer secondUserId;
 
@@ -73,42 +79,57 @@ public class ShopDealerOrder implements Serializable {
     @TableField(exist = false)
     private String secondNickname;
 
-    @Schema(description = "分销商用户id(三级)")
-    private Integer thirdUserId;
-
-    @Schema(description = "分销商用户昵称(三级)")
-    @TableField(exist = false)
-    private String thirdNickname;
-
-    @Schema(description = "分销佣金(一级)")
-    private BigDecimal firstMoney;
-
     @Schema(description = "分销佣金(二级)")
     private BigDecimal secondMoney;
 
-    @Schema(description = "分销佣金(三级)")
+    @Schema(description = "分销商用户id(弃用)")
+    private Integer thirdUserId;
+
+    @Schema(description = "分销商用户昵称(弃用)")
+    @TableField(exist = false)
+    private String thirdNickname;
+
+    @Schema(description = "分销佣金(弃用)")
     private BigDecimal thirdMoney;
 
-    @Schema(description = "门店(一级)")
+    @Schema(description = "一级服务商/门店")
     private Integer firstDividendUser;
 
-    @Schema(description = "门店名称(一级)")
+    @Schema(description = "一级服务商/门店名称")
     @TableField(exist = false)
     private String firstDividendUserName;
 
-    @Schema(description = "分红(一级)")
+    @Schema(description = "一级服务商/门店管理津贴")
     private BigDecimal firstDividend;
 
-    @Schema(description = "门店(二级)")
+    @Schema(description = "一级服务商/门店结算标识 0-否 1-是")
+    private Integer firstDividendFlag;
+
+    @Schema(description = "一级服务商/门店结算单号")
+    private String firstDividendNo;
+
+    @Schema(description = "一级服务商/门店结算时间")
+    private LocalDateTime firstDividendTime;
+
+    @Schema(description = "二级服务商/门店")
     private Integer secondDividendUser;
 
-    @Schema(description = "门店名称(二级)")
+    @Schema(description = "二级服务商/门店名称")
     @TableField(exist = false)
     private String secondDividendUserName;
 
-    @Schema(description = "分红(二级)")
+    @Schema(description = "二级服务商/门店管理津贴")
     private BigDecimal secondDividend;
 
+    @Schema(description = "二级服务商/门店结算标识 0-否 1-是")
+    private Integer secondDividendFlag;
+
+    @Schema(description = "二级服务商/门店结算单号")
+    private String secondDividendNo;
+
+    @Schema(description = "二级服务商/门店结算时间")
+    private LocalDateTime secondDividendTime;
+
     @Schema(description = "佣金比例")
     private BigDecimal rate;
 

src/main/java/com/gxwebsoft/shop/entity/ShopDealerReferee.java

@@ -3,6 +3,8 @@ package com.gxwebsoft.shop.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.io.Serializable;
@@ -87,4 +89,16 @@ public class ShopDealerReferee implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
 
+    @Schema(description = "团队成员")
+    @TableField(exist = false)
+    private Integer teamNum;
+
+    @Schema(description = "订单数")
+    @TableField(exist = false)
+    private Integer orderNum;
+
+    @Schema(description = "订单金额")
+    @TableField(exist = false)
+    private BigDecimal orderAmount;
+
 }

src/main/java/com/gxwebsoft/shop/entity/ShopDealerUser.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.io.Serializable;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -20,6 +22,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Schema(name = "ShopDealerUser对象", description = "分销商用户记录表")
+@TableName("shop_dealer_user")
 public class ShopDealerUser implements Serializable {
     private static final long serialVersionUID = 1L;
 

src/main/java/com/gxwebsoft/shop/entity/ShopDealerWithdraw.java

@@ -27,6 +27,9 @@ public class ShopDealerWithdraw implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
+    @Schema(description = "订单号")
+    private String orderNo;
+
     @Schema(description = "分销商用户ID")
     private Integer userId;
 

src/main/java/com/gxwebsoft/shop/entity/ShopGoods.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import java.io.Serializable;
@@ -21,6 +23,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Schema(name = "ShopGoods对象", description = "商品")
+@TableName("shop_goods")
 public class ShopGoods implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -104,6 +107,9 @@ public class ShopGoods implements Serializable {
     @Schema(description = "配送奖金")
     private BigDecimal deliveryMoney;
 
+    @Schema(description = "推广核验佣金比率")
+    private BigDecimal verifyRate;
+
     @Schema(description = "库存计算方式(10下单减库存 20付款减库存)")
     @JsonAlias({"cdeductStockType"})
     private Integer deductStockType;
@@ -171,6 +177,15 @@ public class ShopGoods implements Serializable {
     @Schema(description = "租户id")
     private Integer tenantId;
 
+    @Schema(description = "配送方式:1-自配送 2-自提 4-发快递 多属性用','隔开")
+    private String deliveryType;
+
+    @Schema(description = "水票标识 0-否 1-是")
+    private Integer waterTicketFlag;
+
+    @Schema(description = "水票ID")
+    private Integer waterTickerId;
+
     @Schema(description = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;

src/main/java/com/gxwebsoft/shop/entity/ShopOrder.java

@@ -1,12 +1,12 @@
 package com.gxwebsoft.shop.entity;
 
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
+
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.time.LocalDateTime;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+
 import java.io.Serializable;
 import java.util.List;
 
@@ -25,6 +25,7 @@ import javax.validation.constraints.*;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Schema(name = "ShopOrder对象", description = "订单")
+@TableName("shop_order")
 public class ShopOrder implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -32,6 +33,9 @@ public class ShopOrder implements Serializable {
     @TableId(value = "order_id", type = IdType.AUTO)
     private Integer orderId;
 
+    @Schema(description = "订单类型 1-及时自配送 2-自提 3-预约自配送 4-发快递")
+    private Integer orderType;
+
     @Schema(description = "订单编号")
     private String orderNo;
 
@@ -309,6 +313,27 @@ public class ShopOrder implements Serializable {
     @Schema(description = "秒杀活动ID")
     private Integer activityId;
 
+    @Schema(description = "水票订单标识 0-否 1-是")
+    private Integer waterTicketFlag;
+
+    @Schema(description = "核销码")
+    private String verifyCode;
+
+    @Schema(description = "核销状态 0-未核销 1-已核销")
+    private Integer verifyStatus;
+
+    @Schema(description = "推广佣金结算核销过期时间")
+    private LocalDateTime verifyExpTime;
+
+    @Schema(description = "核销时间")
+    private LocalDateTime verifyTime;
+
+    @Schema(description = "核销人")
+    private Integer verifyUser;
+
+    @Schema(description = "推广核销佣金")
+    private BigDecimal verifyMoney;
+
     @Schema(description = "修改时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
@@ -353,4 +378,8 @@ public class ShopOrder implements Serializable {
 
     @TableField(exist = false)
     private ShopOrderDelivery shopOrderDelivery;
+
+    @Schema(description = "详细地址")
+    @TableField(exist = false)
+    private String fullAddress;
 }

src/main/java/com/gxwebsoft/shop/entity/ShopSurchargeConfig.java

@@ -0,0 +1,66 @@
+package com.gxwebsoft.shop.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 步梯费用设置
+ *
+ * @author xm
+ * @since 2026-04-28 16:30:00
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(name = "ShopSurchargeConfig对象", description = "步梯费用设置")
+@TableName("shop_surcharge_config")
+public class ShopSurchargeConfig implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @Schema(description = "名称")
+    private String name;
+
+    @Schema(description = "价格（元）")
+    private BigDecimal price;
+
+    @Schema(description = "类型 0-步梯费 1-其他")
+    private Integer type;
+
+    @Schema(description = "状态 0-开启 1-关闭")
+    private Integer status;
+
+    @Schema(description = "排序")
+    private Integer sortNumber;
+
+    @Schema(description = "租户ID")
+    private Integer tenantId;
+
+    @Schema(description = "创建人")
+    private String creator;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "修改人")
+    private String updater;
+
+    @Schema(description = "修改时间")
+    private LocalDateTime updateTime;
+
+    @Schema(description = "是否删除 0-未删 1-已删")
+    @TableLogic
+    private Boolean deleted;
+
+}

src/main/java/com/gxwebsoft/shop/entity/ShopUserAddress.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -20,6 +22,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Schema(name = "ShopUserAddress对象", description = "收货地址")
+@TableName("shop_user_address")
 public class ShopUserAddress implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -48,7 +51,7 @@ public class ShopUserAddress implements Serializable {
     @Schema(description = "收货地址")
     private String address;
 
-    @Schema(description = "收货地址")
+    @Schema(description = "详细地址")
     private String fullAddress;
 
     private String lat;

src/main/java/com/gxwebsoft/shop/mapper/ShopDealerRefereeMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gxwebsoft.shop.entity.ShopDealerReferee;
 import com.gxwebsoft.shop.param.ShopDealerRefereeParam;
+import com.gxwebsoft.shop.vo.ShopDealerRefereeVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -34,4 +35,11 @@ public interface ShopDealerRefereeMapper extends BaseMapper<ShopDealerReferee> {
      */
     List<ShopDealerReferee> selectListRel(@Param("param") ShopDealerRefereeParam param);
 
+    /**
+     * 通过用户ID查询上一级分销人信息【type = 0】
+     * @param userId    用户ID
+     * @return
+     */
+    ShopDealerRefereeVO getDealerIdByUserId(@Param("userId") Integer userId);
+
 }

src/main/java/com/gxwebsoft/shop/mapper/ShopOrderMapper.java

@@ -5,9 +5,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gxwebsoft.shop.entity.ShopOrder;
 import com.gxwebsoft.shop.param.ShopOrderParam;
+import com.gxwebsoft.shop.vo.ShopOrderGoodsVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -60,4 +60,11 @@ public interface ShopOrderMapper extends BaseMapper<ShopOrder> {
     Map<String, Object> selectUserOrderStats(@Param("userId") Integer userId,
                                             @Param("tenantId") Integer tenantId,
                                             @Param("type") Integer type);
+
+    /**
+     * 通过订单号查询订单所有商品分润信息
+     * @param orderNo   订单号
+     * @return
+     */
+    List<ShopOrderGoodsVO> getOrderGoodsInfo(@Param("orderNo") String orderNo);
 }

src/main/java/com/gxwebsoft/shop/mapper/ShopSurchargeConfigMapper.java

@@ -0,0 +1,37 @@
+package com.gxwebsoft.shop.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.gxwebsoft.shop.entity.ShopSurchargeConfig;
+import com.gxwebsoft.shop.param.ShopSurchargeConfigParam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 步梯费用设置Mapper
+ *
+ * @author xm
+ * @since 2026-04-28 16:30:00
+ */
+public interface ShopSurchargeConfigMapper extends BaseMapper<ShopSurchargeConfig> {
+
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param param 查询参数
+     * @return List<ShopSurchargeConfig>
+     */
+    List<ShopSurchargeConfig> selectPageRel(@Param("page") IPage<ShopSurchargeConfig> page,
+                             @Param("param") ShopSurchargeConfigParam param);
+
+    /**
+     * 查询全部
+     *
+     * @param param 查询参数
+     * @return List<User>
+     */
+    List<ShopSurchargeConfig> selectListRel(@Param("param") ShopSurchargeConfigParam param);
+
+}

src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerCapitalMapper.xml

@@ -40,7 +40,6 @@
             </if>
             <if test="param.keywords != null">
                 AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
-                    OR a.user_id = #{param.keywords}
                     OR a.order_no = #{param.keywords}
                 )
               </if>

src/main/java/com/gxwebsoft/shop/mapper/xml/ShopDealerRefereeMapper.xml

@@ -57,5 +57,21 @@
     <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.ShopDealerReferee">
         <include refid="selectSql"></include>
     </select>
+    <select id="getDealerIdByUserId" resultType="com.gxwebsoft.shop.vo.ShopDealerRefereeVO">
+        SELECT
+            b.user_id directUserId,
+            b.type directUserType,
+            d.user_id simpleUserId,
+            d.type simpleUserType
+        FROM
+            shop_dealer_referee a
+                LEFT JOIN shop_dealer_user b ON a.dealer_id = b.user_id
+                LEFT JOIN shop_dealer_referee c ON b.user_id = c.user_id
+                LEFT JOIN shop_dealer_user d ON d.user_id = c.dealer_id
+        WHERE
+            b.is_delete = 0
+          and d.is_delete = 0
+          AND a.user_id = #{userId}
+    </select>
 
 </mapper>

src/main/java/com/gxwebsoft/shop/mapper/xml/ShopOrderMapper.xml

@@ -233,10 +233,6 @@
               OR b.nickname LIKE CONCAT('%', #{param.keywords}, '%')
               )
             </if>
-            <if test="param.statusFilter != 8">
-              <!-- 默认过滤已关闭订单 -->
-              AND a.order_status != 2
-            </if>
             <!-- 订单状态筛选：-1全部，0待支付，1待发货，2待核销，3待收货，4待评价，5已完成，6已退款，7已删除 -->
             <if test="param.statusFilter != null and param.statusFilter != -1">
               <if test="param.statusFilter == 0">
@@ -245,27 +241,27 @@
               </if>
               <if test="param.statusFilter == 1">
                 <!-- 1待发货：已付款但未发货 -->
-                AND a.pay_status = 1 AND a.delivery_status = 10 AND a.order_status = 0
+                AND a.pay_status = 1 AND a.delivery_status = 10 AND a.order_status = 0 AND a.order_type in(1, 3, 4)
               </if>
               <if test="param.statusFilter == 2">
                 <!-- 2待核销：已付款但订单状态为未使用 -->
-                AND a.pay_status = 1 AND a.order_status = 0
+                AND a.pay_status = 1 AND a.order_status = 0 and order_type = 2
               </if>
               <if test="param.statusFilter == 3">
                 <!-- 3待收货：已发货但订单状态不是已完成 -->
-                AND a.delivery_status = 20 AND a.order_status != 1
+                AND a.pay_status = 1 AND a.delivery_status = 20 AND a.order_status = 0
               </if>
               <if test="param.statusFilter == 4">
                 <!-- 4待评价：订单已完成但可能需要评价 -->
-                AND a.order_status = 1 AND a.evaluate_status = 0
+                AND a.pay_status = 1 AND a.order_status = 1 AND a.evaluate_status = 0
               </if>
               <if test="param.statusFilter == 5">
                 <!-- 5已完成：订单状态为已完成 -->
-                AND a.order_status = 1
+                AND a.pay_status = 1 AND a.order_status = 1
               </if>
               <if test="param.statusFilter == 6">
                 <!-- 6退款/售后：订单状态为退款成功 -->
-                AND (a.order_status = 4 OR a.order_status = 5 OR a.order_status = 6 OR a.order_status = 7)
+                AND a.pay_status = 1 AND a.order_status in(4, 5, 6, 7)
               </if>
               <if test="param.statusFilter == 7">
                 <!-- 7已删除：订单被删除 -->
@@ -301,13 +297,13 @@
         SELECT
           -- “全部”默认也会过滤已关闭(取消)订单：statusFilter != 8 时会加 a.order_status != 2
           COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.order_status != 2 THEN 1 ELSE 0 END), 0) AS total,
-          COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.order_status != 2 AND a.pay_status = 0 AND a.order_status = 0 THEN 1 ELSE 0 END), 0) AS waitPay,
-          COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.order_status != 2 AND a.pay_status = 1 AND a.delivery_status = 10 AND a.order_status = 0 THEN 1 ELSE 0 END), 0) AS waitDeliver,
-          COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.order_status != 2 AND a.pay_status = 1 AND a.order_status = 0 THEN 1 ELSE 0 END), 0) AS waitVerify,
-          COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.order_status != 2 AND a.delivery_status = 20 AND a.order_status != 1 THEN 1 ELSE 0 END), 0) AS waitReceive,
-          COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.order_status != 2 AND a.order_status = 1 AND a.evaluate_status = 0 THEN 1 ELSE 0 END), 0) AS waitComment,
-          COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.order_status != 2 AND a.order_status = 1 THEN 1 ELSE 0 END), 0) AS completed,
-          COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.order_status != 2 AND (a.order_status = 4 OR a.order_status = 5 OR a.order_status = 6 OR a.order_status = 7) THEN 1 ELSE 0 END), 0) AS refund,
+          COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 0 AND a.order_status = 0 THEN 1 ELSE 0 END), 0) AS waitPay,
+          COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 0 AND a.order_type in(1, 3, 4) AND a.delivery_status = 10 THEN 1 ELSE 0 END), 0) AS waitDeliver,
+          COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 0 AND a.order_type = 2 THEN 1 ELSE 0 END), 0) AS waitVerify,
+          COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 0 AND a.delivery_status = 20 THEN 1 ELSE 0 END), 0) AS waitReceive,
+          COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 1 AND a.evaluate_status = 0 THEN 1 ELSE 0 END), 0) AS waitComment,
+          COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status = 1 THEN 1 ELSE 0 END), 0) AS completed,
+          COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.pay_status = 1 AND a.order_status in(4, 5, 6, 7) THEN 1 ELSE 0 END), 0) AS refund,
           COALESCE(SUM(CASE WHEN a.deleted = 1 THEN 1 ELSE 0 END), 0) AS deleted,
           COALESCE(SUM(CASE WHEN a.deleted = 0 AND a.order_status = 2 THEN 1 ELSE 0 END), 0) AS canceled
         FROM shop_order a
@@ -324,6 +320,28 @@
   <select id="getByOutTradeNo" resultType="com.gxwebsoft.shop.entity.ShopOrder">
     SELECT * FROM shop_order WHERE order_no = #{outTradeNo}
   </select>
+    <select id="getOrderGoodsInfo" resultType="com.gxwebsoft.shop.vo.ShopOrderGoodsVO">
+        SELECT
+            a.order_no,
+            b.goods_id,
+            c.`name`,
+            b.total_num,
+            b.price,
+            c.first_money,
+            c.second_money,
+            c.first_dividend,
+            c.second_dividend,
+            c.commission_type
+        FROM
+            shop_order a
+                LEFT JOIN shop_order_goods b ON a.order_id = b.order_id
+                LEFT JOIN shop_goods c ON b.goods_id = c.goods_id
+        WHERE
+            a.deleted = 0
+          AND c.deleted = 0
+          AND c.is_open_commission = 1
+          AND a.order_no = #{orderNo}
+    </select>
 
   <!-- 根据订单号修改订单 -->
   <update id="updateByOutTradeNo" parameterType="com.gxwebsoft.cms.entity.CmsWebsite">

src/main/java/com/gxwebsoft/shop/mapper/xml/ShopSurchargeConfigMapper.xml

@@ -0,0 +1,60 @@
+<?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.gxwebsoft.shop.mapper.ShopSurchargeConfigMapper">
+
+    <!-- 关联查询sql -->
+    <sql id="selectSql">
+        SELECT a.*
+        FROM shop_surcharge_config a
+        <where>
+            <if test="param.id != null">
+                AND a.id = #{param.id}
+            </if>
+            <if test="param.name != null">
+                AND a.name LIKE CONCAT('%', #{param.name}, '%')
+            </if>
+            <if test="param.type != null">
+                AND a.type = #{param.type}
+            </if>
+            <if test="param.status != null">
+                AND a.status = #{param.status}
+            </if>
+            <if test="param.sortNumber != null">
+                AND a.sort_number = #{param.sortNumber}
+            </if>
+            <if test="param.creator != null">
+                AND a.creator LIKE CONCAT('%', #{param.creator}, '%')
+            </if>
+            <if test="param.createTimeStart != null">
+                AND a.create_time &gt;= #{param.createTimeStart}
+            </if>
+            <if test="param.createTimeEnd != null">
+                AND a.create_time &lt;= #{param.createTimeEnd}
+            </if>
+            <if test="param.updater != null">
+                AND a.updater LIKE CONCAT('%', #{param.updater}, '%')
+            </if>
+            <if test="param.deleted != null">
+                AND a.deleted = #{param.deleted}
+            </if>
+            <if test="param.deleted == null">
+                AND a.deleted = 0
+            </if>
+            <if test="param.keywords != null">
+                AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
+                )
+              </if>
+        </where>
+    </sql>
+
+    <!-- 分页查询 -->
+    <select id="selectPageRel" resultType="com.gxwebsoft.shop.entity.ShopSurchargeConfig">
+        <include refid="selectSql"></include>
+    </select>
+
+    <!-- 查询全部 -->
+    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.ShopSurchargeConfig">
+        <include refid="selectSql"></include>
+    </select>
+
+</mapper>

src/main/java/com/gxwebsoft/shop/param/ShopOrderParam.java

@@ -1,15 +1,15 @@
 package com.gxwebsoft.shop.param;
 
-import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.gxwebsoft.common.core.annotation.QueryField;
 import com.gxwebsoft.common.core.annotation.QueryType;
 import com.gxwebsoft.common.core.web.BaseParam;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.math.BigDecimal;
+
 /**
  * 订单查询参数
  *

src/main/java/com/gxwebsoft/shop/param/ShopSurchargeConfigParam.java

@@ -0,0 +1,57 @@
+package com.gxwebsoft.shop.param;
+
+import java.math.BigDecimal;
+import com.gxwebsoft.common.core.annotation.QueryField;
+import com.gxwebsoft.common.core.annotation.QueryType;
+import com.gxwebsoft.common.core.web.BaseParam;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 步梯费用设置查询参数
+ *
+ * @author xm
+ * @since 2026-04-28 16:30:00
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Schema(name = "ShopSurchargeConfigParam对象", description = "步梯费用设置查询参数")
+public class ShopSurchargeConfigParam extends BaseParam {
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "主键ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer id;
+
+    @Schema(description = "名称")
+    private String name;
+
+    @Schema(description = "价格（元）")
+    private BigDecimal price;
+
+    @Schema(description = "类型 0-步梯费 1-其他")
+    @QueryField(type = QueryType.EQ)
+    private Integer type;
+
+    @Schema(description = "状态 0-开启 1-关闭")
+    @QueryField(type = QueryType.EQ)
+    private Integer status;
+
+    @Schema(description = "排序")
+    @QueryField(type = QueryType.EQ)
+    private Integer sortNumber;
+
+    @Schema(description = "创建人")
+    private String creator;
+
+    @Schema(description = "修改人")
+    private String updater;
+
+    @Schema(description = "是否删除 0-未删 1-已删")
+    @QueryField(type = QueryType.EQ)
+    private Boolean deleted;
+
+}

src/main/java/com/gxwebsoft/shop/service/OrderBusinessService.java

@@ -1,15 +1,16 @@
 package com.gxwebsoft.shop.service;
 
 import cn.hutool.core.util.IdUtil;
-import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.gxwebsoft.common.core.exception.BusinessException;
-import com.gxwebsoft.common.core.exception.enums.GlobalErrorCodeConstants;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.redis.OrderNoUtils;
 import com.gxwebsoft.shop.config.OrderConfigProperties;
 import com.gxwebsoft.shop.dto.OrderCreateRequest;
 import com.gxwebsoft.shop.entity.*;
 import com.gxwebsoft.shop.mapper.ShopFlashSaleActivityMapper;
-import com.gxwebsoft.shop.service.ShopStoreFenceService;
+import com.gxwebsoft.shop.mapper.ShopOrderMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -19,6 +20,7 @@ import org.springframework.util.CollectionUtils;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.security.SecureRandom;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -37,9 +39,16 @@ public class OrderBusinessService {
     private static final int DEDUCT_STOCK_TYPE_ORDER = 10; // 下单减库存
     private static final int DEDUCT_STOCK_TYPE_PAY = 20;   // 付款减库存
 
+    // 去除易混淆字符：0 O 1 I L 8 B Z
+    private static final String CHAR_POOL = "2345679ACDEFGHJKMNPQRSTUVWXY";
+    private static final SecureRandom RANDOM = new SecureRandom();
+
     @Resource
     private ShopOrderService shopOrderService;
 
+    @Resource
+    private ShopOrderMapper shopOrderMapper;
+
     @Resource
     private ShopOrderGoodsService shopOrderGoodsService;
 
@@ -64,6 +73,9 @@ public class OrderBusinessService {
     @Resource
     private ShopFlashSaleActivityMapper shopFlashSaleActivityMapper;
 
+    @Resource
+    private OrderNoUtils orderNoUtils;
+
     /**
      * 创建订单
      *
@@ -83,32 +95,29 @@ public class OrderBusinessService {
         //3. 处理收货地址信息
         processDeliveryAddress(shopOrder, request, loginUser);
 
-        // 3.1 下单时校验配送范围（电子围栏）
+        //4. 下单时校验配送范围（电子围栏）
         validateDeliveryFenceIfNeeded(shopOrder, loginUser);
 
-        // 4. 应用业务规则
-        applyBusinessRules(shopOrder, loginUser);
-
-        // 如果商品仅有一个则更新formId
+        //5.如果商品仅有一个则更新formId
         if (request.getGoodsItems().size() == 1) {
             shopOrder.setFormId(request.getGoodsItems().get(0).getGoodsId());
         }
 
-        // 5. 保存订单
+        //6.保存订单
         boolean saved = shopOrderService.save(shopOrder);
         if (!saved) {
             throw new BusinessException("订单保存失败");
         }
 
-        // 6. 保存订单商品
+        //7.保存订单商品
         saveOrderGoods(request, shopOrder);
 
-        // 7. 标记优惠券为已使用
+        //8.标记优惠券为已使用
         if (shopOrder.getCouponId() != null && shopOrder.getCouponId() > 0) {
             markCouponAsUsed(shopOrder.getCouponId(), shopOrder.getOrderId());
         }
 
-        // 8. 创建微信支付订单
+        //9.创建微信支付订单
         try {
             return shopOrderService.createWxOrder(shopOrder);
         } catch (Exception e) {
@@ -291,6 +300,10 @@ public class OrderBusinessService {
         }
         shopOrder.setExpirationTime(shopOrder.getCreateTime().plusMinutes(10));
 
+        //设置核销码及过期时间
+        shopOrder.setVerifyCode(getVerifyCode());
+        shopOrder.setVerifyExpTime(shopOrder.getCreateTime().plusMinutes(10));
+
         // 确保租户ID正确设置（关键字段，影响微信支付证书路径）
         shopOrder.setTenantId(loginUser.getTenantId());
 
@@ -307,13 +320,8 @@ public class OrderBusinessService {
         log.debug("构建订单对象 - 租户ID：{}，用户ID：{}", shopOrder.getTenantId(), shopOrder.getUserId());
 
         // 生成订单号（如果请求中没有提供）
-        if (shopOrder.getOrderNo() == null || shopOrder.getOrderNo().trim().isEmpty()) {
-            String generatedOrderNo = Long.toString(IdUtil.getSnowflakeNextId());
-            shopOrder.setOrderNo(generatedOrderNo);
-            log.info("生成新订单号: {}", generatedOrderNo);
-        } else {
-            log.info("使用请求中的订单号: {}", shopOrder.getOrderNo());
-        }
+        String orderNo = orderNoUtils.generate("L");
+        shopOrder.setOrderNo(orderNo);
 
         // 设置默认备注
         if (shopOrder.getComments() == null) {
@@ -356,9 +364,76 @@ public class OrderBusinessService {
             processCoupon(shopOrder, loginUser);
         }
 
+        //订单类型、水票判断  TODO 目前没有购物车业务，每笔订单只下一个商品，后期加购物车多商品同时下单业务需调整
+        Integer orderType = request.getOrderType();
+        List<OrderCreateRequest.OrderGoodsItem> goodsItems = request.getGoodsItems();
+        if(!CollectionUtils.isEmpty(goodsItems)){
+            OrderCreateRequest.OrderGoodsItem goodsItem = goodsItems.get(0);
+            ShopGoods shopGoods = shopGoodsService.getById(goodsItem.getGoodsId());
+            if(shopGoods != null){
+                Integer waterTicketFlag = shopGoods.getWaterTicketFlag();
+                if(waterTicketFlag != null && waterTicketFlag == 1){
+                    shopOrder.setWaterTicketFlag(1);
+                }else {
+                    shopOrder.setWaterTicketFlag(0);
+                }
+
+                //单一配送方式商品如用户没选择配送方式按商品默认配送属性设定订单类型
+                String deliveryType = shopGoods.getDeliveryType();
+                if(orderType == null && StrUtil.isNotBlank(deliveryType) && !deliveryType.contains(",")){
+                    switch (deliveryType){
+                        case "1":
+                        case "3":{
+                            orderType = 1;
+                            break;
+                        }
+                        case "2":{
+                            orderType = 2;
+                            break;
+                        }
+                        case "4":{
+                            orderType = 4;
+                            break;
+                        }
+                        default:{
+                            orderType = 1;
+                        }
+                    }
+                }
+            }
+        }
+        shopOrder.setOrderType(orderType);
+
         return shopOrder;
     }
 
+    /**
+     * 生成8位字母数字混合核销码（推荐）
+     */
+    public static String generate6Mix() {
+        StringBuilder sb = new StringBuilder(6);
+        int len = CHAR_POOL.length();
+        for (int i = 0; i < 6; i++) {
+            int idx = RANDOM.nextInt(len);
+            sb.append(CHAR_POOL.charAt(idx));
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 获取不重复的核销码
+     * @return
+     */
+    public String getVerifyCode(){
+        String verifyCode = generate6Mix();
+        LambdaQueryWrapper<ShopOrder> orderLambdaQueryWrapper = new LambdaQueryWrapper<ShopOrder>().select(ShopOrder::getOrderId).eq(ShopOrder::getVerifyCode, verifyCode);
+        List<ShopOrder> shopOrders = shopOrderMapper.selectList(orderLambdaQueryWrapper);
+        if(!CollectionUtils.isEmpty(shopOrders)){
+            getVerifyCode();
+        }
+        return verifyCode;
+    }
+
     /**
      * 处理优惠券
      */
@@ -556,6 +631,12 @@ public class OrderBusinessService {
             return;
         }
 
+        //自提订单类型不用校验电子围栏
+        Integer orderType = shopOrder.getOrderType();
+        if(orderType != null && orderType == 2){
+            return;
+        }
+
         // 若已配置围栏，则必须有 addressId 才能从地址表取坐标进行校验
         if (shopOrder.getAddressId() == null) {
             if (shopStoreFenceService.hasEnabledFences(shopOrder.getTenantId())) {
@@ -586,9 +667,18 @@ public class OrderBusinessService {
             throw new BusinessException("收货地址坐标异常，请重新选择收货地址");
         }
 
-        // 只做校验；具体围栏列表/points 异常处理由围栏服务统一处理
+        //订单类型：5-配送【系统自动识别电子围栏内转及时配送，电子围栏外发快递】
+        if(orderType != null && orderType == 5){
+            Boolean exit = shopStoreFenceService.validatePointInEnabled(shopOrder.getTenantId(), lng, lat);
+            if(exit){
+                shopOrder.setOrderType(1);
+            }else {
+                shopOrder.setOrderType(4);
+            }
+        }else {
             shopStoreFenceService.validatePointInEnabledFences(shopOrder.getTenantId(), lng, lat);
         }
+    }
 
     /**
      * 应用业务规则

src/main/java/com/gxwebsoft/shop/service/ShopDealerRefereeService.java

@@ -23,6 +23,13 @@ public interface ShopDealerRefereeService extends IService<ShopDealerReferee> {
      */
     PageResult<ShopDealerReferee> pageRel(ShopDealerRefereeParam param);
 
+    /**
+     * app端查询用户层级关系
+     * @param param
+     * @return
+     */
+    PageResult<ShopDealerReferee> appPage(ShopDealerRefereeParam param);
+
     /**
      * 关联查询全部
      *

src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.java

@@ -2,6 +2,7 @@ package com.gxwebsoft.shop.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto;
 import com.gxwebsoft.shop.entity.ShopDealerUser;
 import com.gxwebsoft.shop.param.ShopDealerUserParam;
 
@@ -42,4 +43,11 @@ public interface ShopDealerUserService extends IService<ShopDealerUser> {
     ShopDealerUser getByUserIdRel(Integer userId);
 
     boolean updateByUserId(ShopDealerUser shopDealerUser);
+
+    /**
+     * 更新分销用户资金
+     * @param reduceDto
+     * @return
+     */
+    Boolean reduceBalance(ShopDealerUserReduceDto reduceDto);
 }

src/main/java/com/gxwebsoft/shop/service/ShopOrderService.java

@@ -3,6 +3,7 @@ package com.gxwebsoft.shop.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.shop.dto.UserOrderStats;
+import com.gxwebsoft.shop.dto.VerifyShopOrderDto;
 import com.gxwebsoft.shop.entity.ShopOrder;
 import com.gxwebsoft.shop.param.ShopOrderParam;
 
@@ -86,4 +87,11 @@ public interface ShopOrderService extends IService<ShopOrder> {
      * @param type     订单类型（可为空）
      */
     UserOrderStats getUserOrderStats(Integer userId, Integer tenantId, Integer type);
+
+    /**
+     * 核销订单
+     * @param verifyDto 核销码
+     * @return
+     */
+    Boolean verifyOrder(VerifyShopOrderDto verifyDto);
 }

src/main/java/com/gxwebsoft/shop/service/ShopStoreFenceService.java

@@ -59,4 +59,19 @@ public interface ShopStoreFenceService extends IService<ShopStoreFence> {
      */
     void validatePointInEnabledFences(Integer tenantId, double lng, double lat);
 
+    /**
+     * 校验坐标是否落在任一启用围栏内。
+     * <p>
+     * 约定：
+     * - 围栏按 tenantId + status=0 过滤；
+     * - 支持多个围栏：命中任意一个即通过；
+     * - 无围栏配置：直接放行；
+     * - 围栏 points 异常：抛出异常（避免误送）。
+     *
+     * @param tenantId 租户ID
+     * @param lng      经度
+     * @param lat      纬度
+     */
+    Boolean validatePointInEnabled(Integer tenantId, double lng, double lat);
+
 }

src/main/java/com/gxwebsoft/shop/service/ShopSurchargeConfigService.java

@@ -0,0 +1,70 @@
+package com.gxwebsoft.shop.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.shop.entity.ShopSurchargeConfig;
+import com.gxwebsoft.shop.param.ShopSurchargeConfigParam;
+
+import java.util.List;
+
+/**
+ * 步梯费用设置Service
+ *
+ * @author xm
+ * @since 2026-04-28 16:30:00
+ */
+public interface ShopSurchargeConfigService extends IService<ShopSurchargeConfig> {
+
+    /**
+     * 分页关联查询
+     *
+     * @param param 查询参数
+     * @return PageResult<ShopSurchargeConfig>
+     */
+    PageResult<ShopSurchargeConfig> pageRel(ShopSurchargeConfigParam param);
+
+    /**
+     * 关联查询全部
+     *
+     * @param param 查询参数
+     * @return List<ShopSurchargeConfig>
+     */
+    List<ShopSurchargeConfig> listRel(ShopSurchargeConfigParam param);
+
+    /**
+     * 根据id查询
+     *
+     * @param id 主键ID
+     * @return ShopSurchargeConfig
+     */
+    ShopSurchargeConfig getByIdRel(Integer id);
+
+    /**
+     * 通过类型获取数据
+     * @param type
+     * @return
+     */
+    ShopSurchargeConfig getInfoByType(Integer type);
+
+    /**
+     * 保存信息
+     * @param shopSurchargeConfig
+     * @return
+     */
+    Integer saveInfo(ShopSurchargeConfig shopSurchargeConfig);
+
+    /**
+     * 修改信息
+     * @param shopSurchargeConfig
+     * @return
+     */
+    Boolean updateInfo(ShopSurchargeConfig shopSurchargeConfig);
+
+    /**
+     * 更新数据状态
+     * @param id
+     * @return
+     */
+    Boolean updateStatus(Integer id);
+
+}

src/main/java/com/gxwebsoft/shop/service/ShopUserAddressService.java

@@ -55,4 +55,11 @@ public interface ShopUserAddressService extends IService<ShopUserAddress> {
      */
     List<ShopUserAddress> getUserAddresses(Integer userId);
 
+    /**
+     * 修改用户信息
+     * @param shopUserAddress
+     * @return
+     */
+    Boolean updateInfo(ShopUserAddress shopUserAddress);
+
 }

src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerCommissionRollbackServiceImpl.java

@@ -166,7 +166,7 @@ public class ShopDealerCommissionRollbackServiceImpl implements ShopDealerCommis
         if (refundAmount.compareTo(orderBaseAmount) >= 0) {
             return BigDecimal.ONE;
         }
-        return refundAmount.divide(orderBaseAmount, 10, RoundingMode.HALF_UP);
+        return refundAmount.divide(orderBaseAmount, 3, RoundingMode.HALF_UP);
     }
 
     private void markDealerOrderInvalid(Integer tenantId, String orderNo) {

src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerRefereeServiceImpl.java

@@ -3,22 +3,30 @@ package com.gxwebsoft.shop.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gxwebsoft.common.core.exception.BusinessException;
+import com.gxwebsoft.shop.entity.ShopOrder;
 import com.gxwebsoft.shop.mapper.ShopDealerRefereeMapper;
 import com.gxwebsoft.shop.entity.ShopDealerUser;
+import com.gxwebsoft.shop.mapper.ShopOrderMapper;
 import com.gxwebsoft.shop.service.ShopDealerUserService;
 import com.gxwebsoft.shop.service.ShopDealerRefereeService;
 import com.gxwebsoft.shop.entity.ShopDealerReferee;
 import com.gxwebsoft.shop.param.ShopDealerRefereeParam;
 import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.PageResult;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.dao.DataIntegrityViolationException;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 分销商推荐关系表Service实现
@@ -32,6 +40,9 @@ public class ShopDealerRefereeServiceImpl extends ServiceImpl<ShopDealerRefereeM
     @Resource
     private ShopDealerUserService shopDealerUserService;
 
+    @Resource
+    private ShopOrderMapper shopOrderMapper;
+
     @Override
     public PageResult<ShopDealerReferee> pageRel(ShopDealerRefereeParam param) {
         PageParam<ShopDealerReferee, ShopDealerRefereeParam> page = new PageParam<>(param);
@@ -40,6 +51,57 @@ public class ShopDealerRefereeServiceImpl extends ServiceImpl<ShopDealerRefereeM
         return new PageResult<>(list, page.getTotal());
     }
 
+    @Override
+    public PageResult<ShopDealerReferee> appPage(ShopDealerRefereeParam param) {
+        PageParam<ShopDealerReferee, ShopDealerRefereeParam> page = new PageParam<>(param);
+        page.setDefaultOrder("create_time desc");
+        List<ShopDealerReferee> list = baseMapper.selectPageRel(page, param);
+
+        if(CollectionUtils.isNotEmpty(list)){
+            List<Integer> userIdList = list.stream().map(ShopDealerReferee::getUserId).distinct().collect(Collectors.toList());
+
+            Map<Integer, Long> refereeMap = lambdaQuery().select(ShopDealerReferee::getDealerId, ShopDealerReferee::getUserId).in(ShopDealerReferee::getDealerId, userIdList).list()
+                    .stream().collect(Collectors.groupingBy(ShopDealerReferee::getDealerId, Collectors.counting()));
+
+            LambdaQueryWrapper<ShopOrder> orderLambdaQueryWrapper = new LambdaQueryWrapper<ShopOrder>().select(ShopOrder::getOrderId, ShopOrder::getUserId, ShopOrder::getMoney).in(ShopOrder::getUserId, userIdList)
+                    .in(ShopOrder::getOrderStatus, Arrays.asList(0, 1, 3, 4, 5, 7));
+            List<ShopOrder> shopOrderList = shopOrderMapper.selectList(orderLambdaQueryWrapper);
+
+            Map<Integer, Long> userOrderCountMap = new HashMap<>();
+            Map<Integer, BigDecimal> userAmountMap = new HashMap<>();
+            if(CollectionUtils.isNotEmpty(shopOrderList)){
+                userOrderCountMap = shopOrderList.stream().collect(Collectors.groupingBy(ShopOrder::getUserId, Collectors.counting()));
+                userAmountMap = shopOrderList.stream().collect(Collectors.groupingBy(ShopOrder::getUserId, Collectors.reducing(BigDecimal.ZERO, ShopOrder::getMoney, BigDecimal::add)));
+            }
+
+            Map<Integer, Long> finalUserOrderCountMap = userOrderCountMap;
+            Map<Integer, BigDecimal> finalUserAmountMap = userAmountMap;
+            list.forEach(shopDealerReferee -> {
+                Long teamNum = refereeMap.get(shopDealerReferee.getUserId());
+                if(teamNum != null){
+                    shopDealerReferee.setTeamNum(teamNum.intValue());
+                }else {
+                    shopDealerReferee.setTeamNum(0);
+                }
+
+                Long orderNum = finalUserOrderCountMap.get(shopDealerReferee.getUserId());
+                if(orderNum != null){
+                    shopDealerReferee.setOrderNum(orderNum.intValue());
+                }else {
+                    shopDealerReferee.setOrderNum(0);
+                }
+
+                BigDecimal orderAmount = finalUserAmountMap.get(shopDealerReferee.getUserId());
+                if(orderAmount != null){
+                    shopDealerReferee.setOrderAmount(orderAmount);
+                }else {
+                    shopDealerReferee.setOrderAmount(BigDecimal.ZERO);
+                }
+            });
+        }
+        return new PageResult<>(list, page.getTotal());
+    }
+
     @Override
     public List<ShopDealerReferee> listRel(ShopDealerRefereeParam param) {
         List<ShopDealerReferee> list = baseMapper.selectListRel(param);

src/main/java/com/gxwebsoft/shop/service/impl/ShopDealerUserServiceImpl.java

@@ -2,15 +2,31 @@ package com.gxwebsoft.shop.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.shop.mapper.ShopDealerUserMapper;
-import com.gxwebsoft.shop.service.ShopDealerUserService;
-import com.gxwebsoft.shop.entity.ShopDealerUser;
-import com.gxwebsoft.shop.param.ShopDealerUserParam;
+import com.gxwebsoft.common.core.enums.ShopDealerCapitalUpdateEnum;
+import com.gxwebsoft.common.core.enums.ShopDealerTypeEnum;
+import com.gxwebsoft.common.core.utils.LoginUserUtil;
 import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.mapper.UserMapper;
+import com.gxwebsoft.common.system.redis.OrderNoUtils;
+import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto;
+import com.gxwebsoft.shop.entity.ShopDealerCapital;
+import com.gxwebsoft.shop.entity.ShopDealerUser;
+import com.gxwebsoft.shop.mapper.ShopDealerCapitalMapper;
+import com.gxwebsoft.shop.mapper.ShopDealerUserMapper;
+import com.gxwebsoft.shop.param.ShopDealerUserParam;
+import com.gxwebsoft.shop.service.ShopDealerUserService;
+import lombok.AllArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * 分销商用户记录表Service实现
@@ -19,8 +35,17 @@ import java.util.List;
  * @since 2025-08-11 23:51:41
  */
 @Service
+@AllArgsConstructor
 public class ShopDealerUserServiceImpl extends ServiceImpl<ShopDealerUserMapper, ShopDealerUser> implements ShopDealerUserService {
 
+    private UserMapper userMapper;
+
+    private OrderNoUtils orderNoUtils;
+
+    private ShopDealerCapitalMapper shopDealerCapitalMapper;
+
+    private static final int TENANT_ID = 10584;
+
     @Override
     public PageResult<ShopDealerUser> pageRel(ShopDealerUserParam param) {
         PageParam<ShopDealerUser, ShopDealerUserParam> page = new PageParam<>(param);
@@ -58,4 +83,196 @@ public class ShopDealerUserServiceImpl extends ServiceImpl<ShopDealerUserMapper,
     return update > 0;
   }
 
+    @Override
+    @Transactional
+    public Boolean reduceBalance(ShopDealerUserReduceDto entity) {
+        //1.获取入参
+        log.error("分销账户资金变更明细：" + entity);
+        ShopDealerTypeEnum typeEnum = entity.getTypeEnum();
+        ShopDealerCapitalUpdateEnum updateEnum = entity.getUpdateEnum();
+
+        //2.变动类型为 1-操作冻结账户余额 2-操作提现账户余额【直接结算】是需判断金额值问题
+        if(ShopDealerTypeEnum.FREEZE_ACCOUNT.equals(typeEnum) || ShopDealerTypeEnum.WITHDRAW_ACCOUNT.equals(typeEnum)){
+            //查询分销用户信息
+            ShopDealerUser dealerUser = getDealerUser(entity.getUserId());
+            BigDecimal price = entity.getPrice();
+
+            switch (updateEnum){
+                case DISTRIBUTION_INCOME:
+                case MANAGEMENT_INCOME:
+                case DIVIDEND_INCOME:
+                case PROMOTION_INCOME:
+                case TRANSFER_INCOME:
+                case DELIVERY_INCOME:{
+                    break;
+                }
+                case WITHDRAW_PAYMENT:
+                case TRANSFER_PAYMENT:
+                case ORDER_REFUND:{
+                    price.negate();
+                    break;
+                }
+                default:{
+                    throw new RuntimeException("暂不支持此类型！");
+                }
+            }
+
+            String no = orderNoUtils.generate("C");
+            //3.操作冻结账户余额
+            if(ShopDealerTypeEnum.FREEZE_ACCOUNT.equals(typeEnum)){ //操作冻结账户余额
+                //3.1 账户变更冻结金额
+                dealerUser.setFreezeMoney(dealerUser.getFreezeMoney().add(price));
+                dealerUser.setTotalMoney(dealerUser.getTotalMoney().add(price));
+                baseMapper.updateById(dealerUser);
+
+                //3.2 生成流水
+                ShopDealerCapital dealerCapital = new ShopDealerCapital();
+                dealerCapital.setNo(no);
+                dealerCapital.setUserId(entity.getUserId());
+                dealerCapital.setType(typeEnum.getCode());
+                dealerCapital.setOrderNo(entity.getOrderNo());
+                dealerCapital.setFlowType(updateEnum.getType());
+                dealerCapital.setFreezeMoney(price);
+                dealerCapital.setFreezeMoneyAfter(dealerUser.getFreezeMoney());
+                dealerCapital.setMoneyAfter(dealerUser.getMoney());
+                dealerCapital.setComments(updateEnum.getDescription());
+                dealerCapital.setToUserId(entity.getOrderUserId());
+                dealerCapital.setTenantId(TENANT_ID);
+                dealerCapital.setCreateTime(LocalDateTime.now());
+                User loginUser = LoginUserUtil.getLoginUser();
+                if(loginUser != null){
+                    dealerCapital.setCreator(loginUser.getUserId());
+                }
+                shopDealerCapitalMapper.insert(dealerCapital);
+            }
+
+            //4.操作提现账户余额【直接结算】
+            else if(ShopDealerTypeEnum.WITHDRAW_ACCOUNT.equals(typeEnum)){
+                //4.1 账户变更冻结金额
+                dealerUser.setMoney(dealerUser.getMoney().add(price));
+                dealerUser.setTotalMoney(dealerUser.getTotalMoney().add(price));
+                baseMapper.updateById(dealerUser);
+
+
+                //4.2 生成流水
+                ShopDealerCapital dealerCapital = new ShopDealerCapital();
+                dealerCapital.setNo(no);
+                dealerCapital.setUserId(entity.getUserId());
+                dealerCapital.setType(typeEnum.getCode());
+                dealerCapital.setOrderNo(entity.getOrderNo());
+                dealerCapital.setFlowType(updateEnum.getType());
+                dealerCapital.setMoney(price);
+                dealerCapital.setMoneyAfter(dealerUser.getMoney());
+                dealerCapital.setFreezeMoneyAfter(dealerUser.getFreezeMoney());
+                dealerCapital.setComments(updateEnum.getDescription());
+                dealerCapital.setToUserId(entity.getOrderUserId());
+                dealerCapital.setTenantId(TENANT_ID);
+                dealerCapital.setCreateTime(LocalDateTime.now());
+                User loginUser = LoginUserUtil.getLoginUser();
+                if(loginUser != null){
+                    dealerCapital.setCreator(loginUser.getUserId());
+                }
+                shopDealerCapitalMapper.insert(dealerCapital);
+            }
+        }
+
+        //5.操作解冻业务【按订单号结算，可能一个订单号存在2笔待解冻金额】
+        else if(ShopDealerTypeEnum.DEFROST.equals(typeEnum)){
+            //5.1 判断是否为指定的解冻业务
+            if(!ShopDealerCapitalUpdateEnum.FREEZE_MONEY_THAW.equals(entity.getUpdateEnum())){
+                throw new RuntimeException("暂不支持此类型！");
+            }
+
+            //5.2 查询订单结算流水
+            LambdaQueryWrapper<ShopDealerCapital> capitalLambdaQueryWrapper = new LambdaQueryWrapper<ShopDealerCapital>().eq(ShopDealerCapital::getOrderNo, entity.getOrderNo());
+            List<ShopDealerCapital> dealerCapitalList = shopDealerCapitalMapper.selectList(capitalLambdaQueryWrapper);
+
+            //5.3 根据用户遍历查询及执行解冻业务
+            if(CollectionUtils.isNotEmpty(dealerCapitalList)){
+                List<Integer> userIdList = dealerCapitalList.stream().map(ShopDealerCapital::getUserId).distinct().collect(Collectors.toList());
+                List<ShopDealerUser> shopDealerUserList = lambdaQuery().in(ShopDealerUser::getUserId, userIdList).list();
+
+                Map<Integer, List<ShopDealerCapital>> userCapitalMap = dealerCapitalList.stream().collect(Collectors.groupingBy(ShopDealerCapital::getUserId));
+                userCapitalMap.forEach((k, value) ->{
+
+                    //5.4 查询是否存在待解冻订单数据
+                    ShopDealerCapital userCapital = value.stream().filter(capital -> ShopDealerTypeEnum.FREEZE_ACCOUNT.getCode().equals(capital.getType())).findFirst().orElse(null);
+                    if(userCapital != null){
+
+                        //5.5 查询此订单是否已结算
+                        ShopDealerCapital alreadyCapital = value.stream().filter(capital -> ShopDealerTypeEnum.DEFROST.getCode().equals(capital.getType())).findFirst().orElse(null);
+                        if(alreadyCapital == null){
+                            ShopDealerUser dealerUser = shopDealerUserList.stream().filter(shopDealerUser -> k.equals(shopDealerUser.getUserId())).findFirst().orElse(null);
+
+                            //5.6 判断分销账户分销金额是否大于解冻金额
+                            BigDecimal freezeMoney = userCapital.getFreezeMoney();
+                            if(dealerUser != null && dealerUser.getFreezeMoney().compareTo(freezeMoney) >= 0){
+                                //5.7 账户解冻金额、可提现增加金额
+                                dealerUser.setFreezeMoney(dealerUser.getFreezeMoney().subtract(freezeMoney));
+                                dealerUser.setMoney(dealerUser.getMoney().add(freezeMoney));
+                                baseMapper.updateById(dealerUser);
+
+                                //5.8 生成流水
+                                ShopDealerCapital dealerCapital = new ShopDealerCapital();
+                                String no = orderNoUtils.generate("C");
+                                dealerCapital.setNo(no);
+                                dealerCapital.setUserId(k);
+                                dealerCapital.setType(typeEnum.getCode());
+                                dealerCapital.setOrderNo(entity.getOrderNo());
+                                dealerCapital.setFlowType(updateEnum.getType());
+                                dealerCapital.setFreezeMoney(freezeMoney.negate());
+                                dealerCapital.setFreezeMoneyAfter(dealerUser.getFreezeMoney());
+                                dealerCapital.setMoney(freezeMoney);
+                                dealerCapital.setMoneyAfter(dealerUser.getMoney());
+                                dealerCapital.setComments(updateEnum.getDescription());
+                                dealerCapital.setToUserId(entity.getOrderUserId());
+                                dealerCapital.setTenantId(TENANT_ID);
+                                dealerCapital.setCreateTime(LocalDateTime.now());
+                                User loginUser = LoginUserUtil.getLoginUser();
+                                if (loginUser != null) {
+                                    dealerCapital.setCreator(loginUser.getUserId());
+                                }
+                                shopDealerCapitalMapper.insert(dealerCapital);
+                            }
+                        }
+                    }
+                });
+            }else {
+                log.error("未查询到待解冻订单信息:" + entity.getOrderNo());
+            }
+        }else {
+            throw new RuntimeException("暂不支持此变动类型业务！");
+        }
+        return Boolean.TRUE;
+    }
+
+    public ShopDealerUser getDealerUser(Integer userId){
+        ShopDealerUser shopDealerUser = baseMapper.selectOne(new LambdaQueryWrapper<ShopDealerUser>().eq(ShopDealerUser::getUserId, userId));
+        if(shopDealerUser == null){
+            User user = userMapper.getById(userId);
+            if(user == null){
+                throw new RuntimeException("用户信息不存在！");
+            }
+
+            ShopDealerUser dealerUser = new ShopDealerUser();
+            dealerUser.setType(0);
+            dealerUser.setUserId(userId);
+            dealerUser.setAvatar(user.getAvatar());
+            dealerUser.setRealName(user.getRealName());
+            dealerUser.setMobile(user.getMobile());
+            dealerUser.setMoney(BigDecimal.ZERO);
+            dealerUser.setFreezeMoney(BigDecimal.ZERO);
+            dealerUser.setTotalMoney(BigDecimal.ZERO);
+            dealerUser.setTenantId(TENANT_ID);
+            dealerUser.setCreateTime(LocalDateTime.now());
+            dealerUser.setDealerLevel(0);
+            baseMapper.insert(dealerUser);
+
+            shopDealerUser = dealerUser;
+        }
+        return shopDealerUser;
+    }
+
+
+
 }

src/main/java/com/gxwebsoft/shop/service/impl/ShopOrderServiceImpl.java

@@ -1,40 +1,49 @@
 package com.gxwebsoft.shop.service.impl;
 
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.gxwebsoft.common.core.context.TenantContext;
-import com.gxwebsoft.common.core.config.ConfigProperties;
 import com.gxwebsoft.common.core.config.CertificateProperties;
-import com.gxwebsoft.common.core.utils.*;
-import com.gxwebsoft.common.core.service.PaymentCacheService;
-import com.gxwebsoft.common.core.service.EnvironmentAwarePaymentService;
+import com.gxwebsoft.common.core.config.ConfigProperties;
 import com.gxwebsoft.common.core.config.SpringContextUtil;
+import com.gxwebsoft.common.core.context.TenantContext;
+import com.gxwebsoft.common.core.enums.ShopDealerCapitalUpdateEnum;
+import com.gxwebsoft.common.core.enums.ShopDealerTypeEnum;
+import com.gxwebsoft.common.core.exception.enums.GlobalErrorCodeConstants;
+import com.gxwebsoft.common.core.service.EnvironmentAwarePaymentService;
+import com.gxwebsoft.common.core.service.PaymentCacheService;
+import com.gxwebsoft.common.core.utils.*;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.Payment;
-import com.gxwebsoft.shop.entity.*;
-import com.gxwebsoft.shop.service.*;
-import com.wechat.pay.java.core.RSAAutoCertificateConfig;
-import lombok.extern.slf4j.Slf4j;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.common.system.mapper.UserMapper;
 import com.gxwebsoft.common.system.service.PaymentService;
 import com.gxwebsoft.common.system.service.SettingService;
 import com.gxwebsoft.payment.constants.WechatPayType;
+import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto;
+import com.gxwebsoft.shop.dto.VerifyShopOrderDto;
+import com.gxwebsoft.shop.entity.*;
+import com.gxwebsoft.shop.mapper.ShopGoodsMapper;
 import com.gxwebsoft.shop.mapper.ShopOrderMapper;
+import com.gxwebsoft.shop.mapper.ShopUserAddressMapper;
 import com.gxwebsoft.shop.param.ShopOrderParam;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.shop.service.*;
 import com.wechat.pay.java.core.Config;
+import com.wechat.pay.java.core.RSAAutoCertificateConfig;
 import com.wechat.pay.java.core.RSAConfig;
 import com.wechat.pay.java.core.RSAPublicKeyConfig;
 import com.wechat.pay.java.core.exception.ServiceException;
 import com.wechat.pay.java.service.payments.jsapi.JsapiServiceExtension;
 import com.wechat.pay.java.service.payments.jsapi.model.*;
-import com.wechat.pay.java.service.payments.nativepay.NativePayService;
-// Native支付的类将使用完全限定名避免冲突
 import com.wechat.pay.java.service.payments.model.Transaction;
+import com.wechat.pay.java.service.payments.nativepay.NativePayService;
 import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -44,6 +53,7 @@ import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
 /**
@@ -91,6 +101,14 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
     private ShopExpressService shopExpressService;
     @Resource
     private ShopGoodsSkuService shopGoodsSkuService;
+    @Resource
+    private ShopGoodsMapper shopGoodsMapper;
+    @Resource
+    private ShopUserAddressMapper shopUserAddressMapper;
+    @Resource
+    private ShopDealerUserService shopDealerUserService;
+    @Resource
+    private UserMapper userMapper;
 
     private static final long USER_ORDER_STATS_CACHE_SECONDS = 60L;
     private static final long WECHAT_PREPAY_SNAPSHOT_TTL_MINUTES = 30L;
@@ -320,7 +338,14 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
     public ShopOrder getByIdRel(Integer orderId) {
         ShopOrderParam param = new ShopOrderParam();
         param.setOrderId(orderId);
-        return param.getOne(baseMapper.selectListRel(param));
+        ShopOrder order = param.getOne(baseMapper.selectListRel(param));
+        if(order != null && order.getAddressId() != null){
+            ShopUserAddress shopUserAddress = shopUserAddressMapper.selectById(order.getAddressId());
+            if(shopUserAddress != null && StrUtil.isNotBlank(shopUserAddress.getFullAddress())){
+                order.setFullAddress(shopUserAddress.getFullAddress());
+            }
+        }
+        return order;
     }
 
     @Override
@@ -372,6 +397,119 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
         return stats;
     }
 
+    @Override
+    @Transactional
+    public Boolean verifyOrder(VerifyShopOrderDto verifyDto) {
+        try {
+            //1.判断用户是否登录
+            User loginUser = LoginUserUtil.getLoginUser();
+            if(loginUser == null){
+                throw new RuntimeException(GlobalErrorCodeConstants.UNAUTHORIZED.getMsg());
+            }
+
+            //2.判断是否有核销权限
+            Integer verifyType = verifyDto.getVerifyType();
+            if(verifyType == 2){
+                User user = userMapper.getById(loginUser.getUserId());
+                if(!(user != null && user.getVerifyFlag() != null && user.getVerifyFlag() == 1)){
+                    throw new RuntimeException("暂无核销权限！");
+                }
+            }
+
+            //3.查询订单信息
+            ShopOrder shopOrder = baseMapper.selectOne(new LambdaQueryWrapper<ShopOrder>().eq(ShopOrder::getVerifyCode, verifyDto.getVerifyCode()));
+            if(shopOrder == null){
+                throw new RuntimeException(GlobalErrorCodeConstants.NOT_FOUND.getMsg());
+            }
+
+            //4.判断当前订单状态是否允许核销
+            if(Arrays.asList(2,3,4,6,7).contains(shopOrder.getOrderStatus())){
+                throw new RuntimeException("订单当前状态不可核销！");
+            }
+
+            //5.判断订单是否已支付
+            if(!shopOrder.getPayStatus()){
+                throw new RuntimeException("订单未支付，不可核销！");
+            }
+
+            //6.判断是否已核销
+            if(shopOrder.getVerifyStatus() != null && shopOrder.getVerifyStatus() == 1){
+                throw  new RuntimeException("此订单已核销,无需重复核销！");
+            }
+
+            shopOrder.setVerifyStatus(1);
+            shopOrder.setVerifyTime(LocalDateTime.now());
+            shopOrder.setVerifyUser(loginUser.getUserId());
+
+            //7.只有推广结算才会记佣且判断是否在设定有效期内核销订单【是：计算订单核销佣金 否：不计算核销佣金】
+            if(verifyType == 2 && shopOrder.getVerifyExpTime().isAfter(LocalDateTime.now())){
+                List<ShopOrderGoods> orderGoodsList = shopOrderGoodsService.getListByOrderId(shopOrder.getOrderId());
+                if(!CollectionUtils.isEmpty(orderGoodsList)){
+                    List<Integer> goodsIdList = orderGoodsList.stream().map(ShopOrderGoods::getGoodsId).distinct().collect(Collectors.toList());
+                    List<ShopGoods> shopGoods = shopGoodsMapper.selectBatchIds(goodsIdList);
+
+                    //计算推广佣金
+                    AtomicReference<BigDecimal> verifyMoney = new AtomicReference<>(BigDecimal.ZERO);
+
+                    orderGoodsList.forEach(orderGoods -> {
+                        ShopGoods shopGood = shopGoods.stream().filter(goods -> orderGoods.getGoodsId().equals(goods.getGoodsId()) &&
+                                goods.getVerifyRate().compareTo(BigDecimal.ZERO) > 0).findFirst().orElse(null);
+
+                        if (shopGood != null) {
+                            // 计算单商品核价金额
+                            BigDecimal money = orderGoods.getPrice()
+                                    .multiply(BigDecimal.valueOf(orderGoods.getTotalNum()))
+                                    .multiply(shopGood.getVerifyRate())
+                                    .divide(BigDecimal.valueOf(100), 3, RoundingMode.HALF_UP); // 除100，保留2位小数
+
+                            // ✅ 原子更新（关键！）
+                            verifyMoney.set(verifyMoney.get().add(money));
+                        }
+                    });
+                    shopOrder.setVerifyMoney(verifyMoney.get());
+
+                    //结算推广佣金
+                    if(verifyMoney.get().compareTo(BigDecimal.ZERO) > 0){
+                        ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto();
+                        reduceDto.setTypeEnum(ShopDealerTypeEnum.WITHDRAW_ACCOUNT);
+                        reduceDto.setUserId(loginUser.getUserId());
+                        reduceDto.setOrderUserId(shopOrder.getUserId());
+                        reduceDto.setOrderNo(shopOrder.getOrderNo());
+                        reduceDto.setPrice(verifyMoney.get());
+                        reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.PROMOTION_INCOME);
+
+                        Boolean reduceBalance = shopDealerUserService.reduceBalance(reduceDto);
+                        if(!reduceBalance){
+                            log.error("推广核销失败，结算推广佣金失败：" + reduceDto);
+                        }
+
+                    }
+                }
+            }
+
+            //8.判断是否自提订单，如是自提订单需调整为订单完成，用户已收货状态
+            if(shopOrder.getOrderType() != null && shopOrder.getOrderType() == 2){
+                shopOrder.setOrderStatus(1);
+                shopOrder.setDeliveryStatus(20);
+
+                //分销佣金结算【团队长管理津贴、股东分红在订单完成后再结算】
+                ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto();
+                reduceDto.setTypeEnum(ShopDealerTypeEnum.DEFROST);
+                reduceDto.setOrderUserId(shopOrder.getUserId());
+                reduceDto.setOrderNo(shopOrder.getOrderNo());
+                reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.FREEZE_MONEY_THAW);
+
+                Boolean reduceBalance = shopDealerUserService.reduceBalance(reduceDto);
+                if(!reduceBalance){
+                    log.error("分销核销失败，分销结算失败：" + reduceDto);
+                }
+            }
+            return baseMapper.updateById(shopOrder) > 0;
+        }catch (Exception e){
+            throw new RuntimeException("核销失败：" + e.getMessage());
+        }
+    }
+
     private static Long getLong(Map<String, Object> raw, String key) {
         Object value = raw.get(key);
         if (value == null) {

src/main/java/com/gxwebsoft/shop/service/impl/ShopStoreFenceServiceImpl.java

@@ -106,4 +106,49 @@ public class ShopStoreFenceServiceImpl extends ServiceImpl<ShopStoreFenceMapper,
         throw new BusinessException("收货地址不在配送范围内");
     }
 
+    @Override
+    public Boolean validatePointInEnabled(Integer tenantId, double lng, double lat) {
+        if (tenantId == null) {
+            // tenantId 缺失时不做围栏校验，避免误伤；上层应保证 tenantId 正确传入
+            return true;
+        }
+
+        List<ShopStoreFence> fences = this.list(new LambdaQueryWrapper<ShopStoreFence>()
+                .eq(ShopStoreFence::getTenantId, tenantId)
+                .eq(ShopStoreFence::getStatus, 0)
+                .orderByAsc(ShopStoreFence::getSortNumber)
+                .orderByDesc(ShopStoreFence::getCreateTime));
+
+        // 无围栏配置：默认放行
+        if (fences == null || fences.isEmpty()) {
+            return true;
+        }
+
+        for (ShopStoreFence fence : fences) {
+            if (fence == null) {
+                continue;
+            }
+            List<GeoFenceUtil.Point> polygon;
+            try {
+                polygon = GeoFenceUtil.parsePolygonPoints(fence.getPoints());
+            } catch (Exception e) {
+                // points 异常：直接拒单并记录日志，避免误送
+                log.error("围栏 points 解析失败，tenantId={}, fenceId={}, points={}",
+                        tenantId, fence.getId(), fence.getPoints(), e);
+                throw new BusinessException("配送范围配置异常，请联系商家");
+            }
+
+            if (polygon == null || polygon.size() < 3) {
+                log.error("围栏 points 点数不足，tenantId={}, fenceId={}, points={}",
+                        tenantId, fence.getId(), fence.getPoints());
+                throw new BusinessException("配送范围配置异常，请联系商家");
+            }
+
+            if (GeoFenceUtil.containsInclusive(polygon, lng, lat)) {
+                return true; // 命中任一围栏即通过
+            }
+        }
+        return false;
+    }
+
 }

src/main/java/com/gxwebsoft/shop/service/impl/ShopSurchargeConfigServiceImpl.java

@@ -0,0 +1,114 @@
+package com.gxwebsoft.shop.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.common.core.exception.enums.GlobalErrorCodeConstants;
+import com.gxwebsoft.common.core.utils.LoginUserUtil;
+import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.shop.mapper.ShopSurchargeConfigMapper;
+import com.gxwebsoft.shop.service.ShopSurchargeConfigService;
+import com.gxwebsoft.shop.entity.ShopSurchargeConfig;
+import com.gxwebsoft.shop.param.ShopSurchargeConfigParam;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import lombok.AllArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * 步梯费用设置Service实现
+ *
+ * @author xm
+ * @since 2026-04-28 16:30:00
+ */
+@Service
+@AllArgsConstructor
+public class ShopSurchargeConfigServiceImpl extends ServiceImpl<ShopSurchargeConfigMapper, ShopSurchargeConfig> implements ShopSurchargeConfigService {
+
+    @Override
+    public PageResult<ShopSurchargeConfig> pageRel(ShopSurchargeConfigParam param) {
+        PageParam<ShopSurchargeConfig, ShopSurchargeConfigParam> page = new PageParam<>(param);
+        page.setDefaultOrder("sort_number asc, create_time desc");
+        List<ShopSurchargeConfig> list = baseMapper.selectPageRel(page, param);
+        return new PageResult<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<ShopSurchargeConfig> listRel(ShopSurchargeConfigParam param) {
+        List<ShopSurchargeConfig> list = baseMapper.selectListRel(param);
+        // 排序
+        PageParam<ShopSurchargeConfig, ShopSurchargeConfigParam> page = new PageParam<>();
+        page.setDefaultOrder("sort_number asc, create_time desc");
+        return page.sortRecords(list);
+    }
+
+    @Override
+    public ShopSurchargeConfig getByIdRel(Integer id) {
+        ShopSurchargeConfigParam param = new ShopSurchargeConfigParam();
+        param.setId(id);
+        return param.getOne(baseMapper.selectListRel(param));
+    }
+
+    @Override
+    public ShopSurchargeConfig getInfoByType(Integer type) {
+        List<ShopSurchargeConfig> list = lambdaQuery().eq(ShopSurchargeConfig::getType, type).list();
+        if(CollectionUtils.isNotEmpty(list)){
+            return list.get(0);
+        }
+        return null;
+    }
+
+    @Override
+    public Integer saveInfo(ShopSurchargeConfig entity) {
+        List<ShopSurchargeConfig> list = lambdaQuery().eq(ShopSurchargeConfig::getType, entity.getType()).list();
+        if(CollectionUtils.isNotEmpty(list)){
+            throw new RuntimeException("该类型收费数据已存在！");
+        }
+        User loginUser = LoginUserUtil.getLoginUser();
+        entity.setCreator(String.valueOf(loginUser.getUserId()));
+        entity.setCreateTime(LocalDateTime.now());
+
+        baseMapper.insert(entity);
+        return entity.getId();
+    }
+
+    @Override
+    public Boolean updateInfo(ShopSurchargeConfig entity) {
+        List<ShopSurchargeConfig> list = lambdaQuery().eq(ShopSurchargeConfig::getType, entity.getType()).list();
+        if(CollectionUtils.isNotEmpty(list)){
+            throw new RuntimeException("该类型收费数据已存在！");
+        }
+
+        User loginUser = LoginUserUtil.getLoginUser();
+        entity.setUpdater(String.valueOf(loginUser.getUserId()));
+        entity.setUpdateTime(LocalDateTime.now());
+
+        return baseMapper.updateById(entity) > 0;
+    }
+
+    @Override
+    public Boolean updateStatus(Integer id) {
+        User loginUser = LoginUserUtil.getLoginUser();
+        if(loginUser == null){
+            throw new RuntimeException(GlobalErrorCodeConstants.UNAUTHORIZED.getMsg());
+        }
+
+        ShopSurchargeConfig config = baseMapper.selectById(id);
+        if(config == null){
+            throw new RuntimeException(GlobalErrorCodeConstants.NOT_FOUND.getMsg());
+        }
+
+        if(config.getStatus() == 0){
+            config.setStatus(1);
+        }else {
+            config.setStatus(0);
+        }
+        config.setUpdater(String.valueOf(loginUser.getUserId()));
+        config.setUpdateTime(LocalDateTime.now());
+
+        return baseMapper.updateById(config) > 0;
+    }
+
+}

src/main/java/com/gxwebsoft/shop/service/impl/ShopUserAddressServiceImpl.java

@@ -8,8 +8,11 @@ import com.gxwebsoft.shop.entity.ShopUserAddress;
 import com.gxwebsoft.shop.param.ShopUserAddressParam;
 import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.PageResult;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -65,4 +68,25 @@ public class ShopUserAddressServiceImpl extends ServiceImpl<ShopUserAddressMappe
         return list(wrapper);
     }
 
+    @Override
+    @Transactional
+    public Boolean updateInfo(ShopUserAddress shopUserAddress) {
+        ShopUserAddress address = baseMapper.selectById(shopUserAddress.getId());
+        if(address != null){
+            if(shopUserAddress.getIsDefault()){
+                List<ShopUserAddress> list = lambdaQuery().eq(ShopUserAddress::getIsDefault, true).eq(ShopUserAddress::getUserId, address.getUserId())
+                        .ne(ShopUserAddress::getId, address.getId()).list();
+                if(CollectionUtils.isNotEmpty(list)){
+                    list.forEach(userAddress ->{
+                        userAddress.setIsDefault(false);
+                    });
+                }
+                updateBatchById(list);
+            }
+            shopUserAddress.setUpdateTime(LocalDateTime.now());
+            return baseMapper.updateById(shopUserAddress) > 0;
+        }
+        return false;
+    }
+
 }

src/main/java/com/gxwebsoft/shop/task/OrderAutoCancelTask.java

@@ -38,7 +38,7 @@ public class OrderAutoCancelTask {
      * 生产环境：每5分钟执行一次
      * 开发环境：每1分钟执行一次（便于测试）
      */
-    @Scheduled(cron = "${shop.order.auto-cancel.cron:0 */1 * * * ?}")
+    @Scheduled(cron = "${shop.order.auto-cancel.cron:0 */5 * * * ?}")
     @IgnoreTenant("定时任务需要处理所有租户的超时订单")
     public void cancelExpiredOrders() {
         if (!orderConfig.getAutoCancel().isEnabled()) {

src/main/java/com/gxwebsoft/shop/vo/ShopDealerRefereeVO.java

@@ -0,0 +1,27 @@
+package com.gxwebsoft.shop.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ *
+ * @author xm
+ * @since 2026-05-13
+ */
+@Data
+@Schema(description = "两级推荐人数据")
+public class ShopDealerRefereeVO {
+
+    @Schema(description = "一级推荐人")
+    private Integer directUserId;
+
+    @Schema(description = "一级推荐人类型 0-分销商 1-门店/服务商 2-集团分红")
+    private Integer directUserType;
+
+    @Schema(description = "二级推荐人")
+    private Integer simpleUserId;
+
+    @Schema(description = "二级推荐人类型 0-分销商 1-门店/服务商 2-集团分红")
+    private Integer simpleUserType;
+
+}

src/main/java/com/gxwebsoft/shop/vo/ShopOrderGoodsVO.java

@@ -0,0 +1,47 @@
+package com.gxwebsoft.shop.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单商品信息
+ * @author xm
+ * @since 2025-01-12
+ */
+@Data
+@Schema(description = "订单商品信息")
+public class ShopOrderGoodsVO {
+
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    @Schema(description = "商品ID")
+    private Integer goodsId;
+
+    @Schema(description = "品名")
+    private String name;
+
+    @Schema(description = "购买数量")
+    private Integer totalNum;
+
+    @Schema(description = "单价")
+    private BigDecimal price;
+
+    @Schema(description = "结算方式 10按金额 20按比率")
+    private Integer commissionType;
+
+    @Schema(description = "一级分销员佣金比例/金额")
+    private BigDecimal firstMoney;
+
+    @Schema(description = "二级分销员佣金比例/金额")
+    private BigDecimal secondMoney;
+
+    @Schema(description = "一级服务商管理津贴比例/金额")
+    private BigDecimal firstDividend;
+
+    @Schema(description = "二级服务商管理津贴比例/金额")
+    private BigDecimal secondDividend;
+
+}

src/main/resources/application-dev.yml

@@ -13,12 +13,10 @@ spring:
     driver-class-name: com.mysql.cj.jdbc.Driver
     type: com.alibaba.druid.pool.DruidDataSource
 
-  # redis
   redis:
     database: 0
-    host: 8.134.55.105
-    port: 16379
-    password: redis_t74P8C
+    host: localhost
+    port: 6379
 
 # 日志配置
 logging:

src/main/resources/application-glt.yml

@@ -50,7 +50,7 @@ config:
   # 生产环境接口
   server-url: https://glt-server.websoft.top/api
   # 业务模块接口
-  api-url: https://glt-api.websoft.top/api
+  api-url: https://glt-dev-api.websoft.top/api
   upload-path: /www/wwwroot/file.ws
 
   # 阿里云OSS云存储

src/main/resources/application-glt2.yml

@@ -1,73 +0,0 @@
-# 开发环境配置
-
-# 服务器配置
-server:
-  port: 9200
-
-# 数据源配置
-spring:
-  datasource:
-    url: jdbc:mysql://1Panel-mysql-XsWW:3306/gltdb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
-    username: gltdb
-    password: EeD4FtzyA5ksj7Bk
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    type: com.alibaba.druid.pool.DruidDataSource
-
-  # redis
-  redis:
-    database: 0
-    host: 1Panel-redis-GmNr
-    port: 6379
-    password: redis_t74P8C
-
-# 日志配置
-logging:
-  level:
-    com.gxwebsoft: DEBUG
-    com.baomidou.mybatisplus: DEBUG
-
-socketio:
-  host: localhost #IP地址
-
-# MQTT配置
-mqtt:
-  enabled: false  # 添加开关来禁用MQTT服务
-  host: tcp://132.232.214.96:1883
-  username: swdev
-  password: Sw20250523
-  client-id-prefix: hjm_car_
-  topic: /SW_GPS/#
-  qos: 2
-  connection-timeout: 10
-  keep-alive-interval: 20
-  auto-reconnect: true
-
-# 框架配置
-config:
-  # 基础模块接口
-  server-url: https://glt-server.websoft.top/api
-  # 业务模块接口
-  api-url: https://glt-api.websoft.top/api
-  upload-path: /Users/gxwebsoft/Documents/uploads/   # window(D:\Temp)
-
-# 开发环境证书配置
-certificate:
-  load-mode: CLASSPATH  # 开发环境从classpath加载
-  wechat-pay:
-    dev:
-      private-key-file: "apiclient_key.pem"
-      apiclient-cert-file: "apiclient_cert.pem"
-      wechatpay-cert-file: "wechatpay_cert.pem"
-
-# 阿里云翻译配置
-aliyun:
-  translate:
-    access-key-id: LTAI5tEsyhW4GCKbds1qsopg
-    access-key-secret: zltFlQrYVAoq2KMFDWgLa3GhkMNeyO
-    endpoint: mt.cn-hangzhou.aliyuncs.com
-
-# 微信支付-商家转账（升级版）转账场景报备信息（必须与商户平台 transfer_scene_id=1005 的报备信息一致）
-wechatpay:
-  transfer:
-    scene-id: 1005
-    scene-report-infos-json: '[{"info_type":"岗位类型","info_content":"业务员"},{"info_type":"报酬说明","info_content":"配送费"}]'

src/main/resources/application-glt3.yml

@@ -1,86 +0,0 @@
-# 服务器配置
-server:
-  port: 9300
-# 数据源配置
-spring:
-  datasource:
-    url: jdbc:mysql://1Panel-mysql-XsWW:3306/gltdb?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
-    username: gltdb
-    password: EeD4FtzyA5ksj7Bk
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    type: com.alibaba.druid.pool.DruidDataSource
-    druid:
-      remove-abandoned: true
-
-  # redis
-  redis:
-    database: 0
-    host: 1Panel-redis-GmNr
-    port: 6379
-    password: redis_t74P8C
-
-# 日志配置
-logging:
-  file:
-    name: websoft-modules.log
-  level:
-    root: WARN
-    com.gxwebsoft: ERROR
-    com.baomidou.mybatisplus: ERROR
-
-socketio:
-  host: 0.0.0.0 #IP地址
-
-# MQTT配置
-mqtt:
-  enabled: false   # 启用MQTT服务
-  host: tcp://132.232.214.96:1883
-  username: swdev
-  password: Sw20250523
-  client-id-prefix: hjm_car_
-  topic: /SW_GPS/#
-  qos: 2
-  connection-timeout: 10
-  keep-alive-interval: 20
-  auto-reconnect: true
-
-# 框架配置
-config:
-  # 文件服务器
-  file-server: https://file-s209.shoplnk.cn
-  # 生产环境接口
-  server-url: https://glt-server.websoft.top/api
-  # 业务模块接口
-  api-url: https://glt-api.websoft.top/api
-  upload-path: /www/wwwroot/file.ws
-
-  # 阿里云OSS云存储
-  endpoint: https://oss-cn-shenzhen.aliyuncs.com
-  accessKeyId: LTAI4GKGZ9Z2Z8JZ77c3GNZP
-  accessKeySecret: BiDkpS7UXj72HWwDWaFZxiXjNFBNCM
-  bucketName: oss-gxwebsoft
-  bucketDomain: https://oss.wsdns.cn
-  aliyunDomain: https://oss-gxwebsoft.oss-cn-shenzhen.aliyuncs.com
-
-# 生产环境证书配置
-certificate:
-  load-mode: VOLUME  # 生产环境从Docker挂载卷加载
-  cert-root-path: /www/wwwroot/file.ws
-
-# 支付配置缓存
-payment:
-  cache:
-    # 支付配置缓存键前缀，生产环境使用 Payment:1* 格式
-    key-prefix: "Payment:1"
-    # 缓存过期时间（小时）
-    expire-hours: 24
-# 阿里云翻译配置
-aliyun:
-  translate:
-    access-key-id: LTAI5tEsyhW4GCKbds1qsopg
-    access-key-secret: zltFlQrYVAoq2KMFDWgLa3GhkMNeyO
-    endpoint: mt.cn-hangzhou.aliyuncs.com
-wechatpay:
-  transfer:
-    scene-id: 1005
-    scene-report-infos-json: '[{"info_type":"岗位类型","info_content":"配送员"},{"info_type":"报酬说明","info_content":"12月份配送费"}]'

src/main/resources/application.yml

@@ -5,6 +5,8 @@ server:
 spring:
   profiles:
     active: dev
+#    active: glt
+#    active: prod
 
   application:
     name: server
@@ -254,7 +256,7 @@ payment:
   # 开发环境配置
   dev:
     # 开发环境回调地址（本地调试用）
-    notify-url: "http://frps-10550.s209.websoft.top/api/shop/shop-order/notify"
+    notify-url: "https://glt-dev-api.websoft.top/api/shop/shop-order/notify"
     # 开发环境是否启用环境感知
     environment-aware: true