1、优化配送派单消息推送功能

2、优化送水订单配送状态、水票标识查询，回显品名、水票标识、订单状态业务
3、优化送水订单接单、送达业务
4、优化资金表、资金流水表资金变更同步业务

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

@@ -32,7 +32,7 @@ public class CertificateProperties {
     /**
      * 开发环境证书路径前缀
      */
-    private String devCertPath = "dev";
+    private String devCertPath = "local";
 
     /**
      * 微信支付证书配置

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

@@ -60,7 +60,7 @@ public class ConfigProperties {
   /**
    * token过期时间, 单位秒
    */
-  private Long tokenExpireTime = 60 * 60 * 365 * 24L;
+  private Long tokenExpireTime = 60 * 60 * 30 * 24L;
 
   /**
    * token快要过期自动刷新时间, 单位分钟

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

@@ -80,6 +80,7 @@ public class MybatisPlusConfig {
 
             @Override
             public boolean ignoreTable(String tableName) {
+//                TenantContext.setIgnoreTenant(Boolean.TRUE);
                 // 如果当前上下文设置了忽略租户隔离，则忽略所有表的租户隔离
                 if (TenantContext.isIgnoreTenant()) {
                     return true;
@@ -92,17 +93,8 @@ public class MybatisPlusConfig {
                         "sys_dictionary_data",
                         "apps_test_data",
                         "cms_lang",
-//                        "hjm_car",
-//                        "hjm_fence"
-//                        "cms_website"
-//                        "sys_user"
-//                        "cms_domain"
-//                        "shop_order_goods",
                         "shop_goods",
-//                        "shop_users",
+                        "shop_order" ,
-                        "shop_order" , // 移除shop_order，改为通过注解控制
-//                        "shop_order_info",
-//                        "booking_user_invoice"
                         "shop_order_goods",
                         "glt_ticket_template",
                         "glt_user_ticket",
@@ -110,7 +102,8 @@ public class MybatisPlusConfig {
                         "glt_user_ticket_log",
                         "shop_dealer_user",
                         "shop_dealer_order",
-                        "shop_dealer_referee"
+                        "shop_dealer_referee",
+                        "shop_store_rider"
                 ).contains(tableName);
             }
         };

src/main/java/com/gxwebsoft/common/core/controller/DatabaseFixController.java

@@ -30,7 +30,7 @@ import java.util.Map;
 @Tag(name = "数据库修复工具")
 @RestController
 @RequestMapping("/api/database-fix")
-// @ConditionalOnProperty(name = "spring.profiles.active", havingValue = "dev")
+// @ConditionalOnProperty(name = "spring.profiles.active", havingValue = "local")
 public class DatabaseFixController extends BaseController {
 
     @Autowired

src/main/java/com/gxwebsoft/common/core/controller/DevEnvironmentController.java

@@ -28,7 +28,7 @@ import java.util.Map;
 @Tag(name = "开发环境管理")
 @RestController
 @RequestMapping("/api/dev")
-// @ConditionalOnProperty(name = "spring.profiles.active", havingValue = "dev")
+// @ConditionalOnProperty(name = "spring.profiles.active", havingValue = "local")
 public class DevEnvironmentController extends BaseController {
 
     @Autowired

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

@@ -15,11 +15,14 @@ public enum ShopDealerCapitalUpdateEnum {
     MANAGEMENT_INCOME(11, "团队管理津贴收入", true),
     DIVIDEND_INCOME(12, "分红收入", true),
     PROMOTION_INCOME(13, "现场推广收入", true),
+    PROMOTION_PARENT_INCOME(14, "现场推广分佣", true),
     WITHDRAW_PAYMENT(20, "提现支出", false),
     TRANSFER_PAYMENT(30, "转账支出", false),
     TRANSFER_INCOME(40, "转账收入", true),
     FREEZE_MONEY_THAW(50, "佣金解冻", true),
-    DELIVERY_INCOME(60, "配送奖励", true),
+    DELIVERY_REWARD(60, "配送奖励", true),
+    DELIVERY_INCOME(61, "配送提成", true),
+    DELIVERY_FLOOR_FEE(62, "配送步梯费", true),
     ORDER_REFUND(70, "佣金退回(退单)", false),
     ;
 

src/main/java/com/gxwebsoft/common/core/service/EnvironmentAwarePaymentService.java

@@ -70,7 +70,7 @@ public class EnvironmentAwarePaymentService {
      * 根据当前环境获取回调地址
      */
     private String getEnvironmentNotifyUrl() {
-        if ("dev".equals(activeProfile) || "test".equals(activeProfile)) {
+        if ("local".equals(activeProfile) || "test".equals(activeProfile)) {
             // 开发/测试环境使用本地回调地址
             return devNotifyUrl;
         } else if ("prod".equals(activeProfile)) {
@@ -135,7 +135,7 @@ public class EnvironmentAwarePaymentService {
      * 是否为开发环境
      */
     public boolean isDevelopmentEnvironment() {
-        return "dev".equals(activeProfile) || "test".equals(activeProfile);
+        return "local".equals(activeProfile) || "test".equals(activeProfile);
     }
 
     /**

src/main/java/com/gxwebsoft/common/core/utils/WechatCertAutoConfig.java

@@ -84,7 +84,7 @@ public class WechatCertAutoConfig {
         String apiV3Key = "0kF5OlPr482EZwtn9zGufUcqa7ovgxRL";
 
         // 根据环境选择证书路径
-        if ("dev".equals(activeProfile)) {
+        if ("local".equals(activeProfile)) {
             // 开发环境：使用配置文件upload-path拼接证书路径
             String uploadPath = configProperties.getUploadPath(); // 配置文件路径
             String tenantId = "10550"; // 租户ID

src/main/java/com/gxwebsoft/common/core/utils/WechatPayCertificateDiagnostic.java

@@ -105,7 +105,7 @@ public class WechatPayCertificateDiagnostic {
      * 检查证书文件
      */
     private void checkCertificateFiles(Payment payment, Integer tenantId, String environment, DiagnosticResult result) {
-        if ("dev".equals(environment)) {
+        if ("local".equals(environment)) {
             // 开发环境证书检查
             String tenantCertPath = "dev/wechat/" + tenantId;
             String privateKeyPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getPrivateKeyFile();
@@ -152,7 +152,7 @@ public class WechatPayCertificateDiagnostic {
      */
     private void validateCertificateContent(Payment payment, Integer tenantId, String environment, DiagnosticResult result) {
         try {
-            if ("dev".equals(environment)) {
+            if ("local".equals(environment)) {
                 String tenantCertPath = "dev/wechat/" + tenantId;
                 String apiclientCertPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getApiclientCertFile();
 

src/main/java/com/gxwebsoft/common/core/utils/WechatPayCertificateFixer.java

@@ -103,7 +103,7 @@ public class WechatPayCertificateFixer {
      * 修复证书文件问题
      */
     private void fixCertificateFiles(Payment payment, Integer tenantId, String environment, FixResult result) {
-        if ("dev".equals(environment)) {
+        if ("local".equals(environment)) {
             fixDevCertificateFiles(tenantId, result);
         } else {
             fixProdCertificateFiles(payment, result);
@@ -169,7 +169,7 @@ public class WechatPayCertificateFixer {
         }
         
         // 在开发环境中，尝试从证书文件中提取序列号进行验证
-        if ("dev".equals(environment)) {
+        if ("local".equals(environment)) {
             try {
                 String tenantCertPath = "dev/wechat/" + tenantId;
                 String apiclientCertPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getApiclientCertFile();

src/main/java/com/gxwebsoft/common/core/utils/WechatPayConfigValidator.java

@@ -115,7 +115,7 @@ public class WechatPayConfigValidator {
      * 验证证书文件
      */
     private void validateCertificateFiles(Integer tenantId, ValidationResult result) {
-        if ("dev".equals(activeProfile)) {
+        if ("local".equals(activeProfile)) {
             // 开发环境证书验证
             String tenantCertPath = "dev/wechat/" + tenantId;
             String privateKeyPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getPrivateKeyFile();
@@ -195,7 +195,7 @@ public class WechatPayConfigValidator {
 
         // 证书文件检查
         report.append("当前环境: ").append(activeProfile).append("\n");
-        if ("dev".equals(activeProfile)) {
+        if ("local".equals(activeProfile)) {
             String tenantCertPath = "dev/wechat/" + tenantId;
             String privateKeyPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getPrivateKeyFile();
             boolean certExists = certificateLoader.certificateExists(privateKeyPath);

src/main/java/com/gxwebsoft/common/core/utils/WechatPayDiagnostic.java

@@ -78,7 +78,7 @@ public class WechatPayDiagnostic {
         }
         
         // 生产环境检查证书文件
-        if (!"dev".equals(environment)) {
+        if (!"local".equals(environment)) {
             if (payment.getApiclientCert() != null) {
                 log.info("商户证书文件配置: {}", payment.getApiclientCert());
             }

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

@@ -70,4 +70,11 @@ public interface UserMapper extends BaseMapper<User> {
 
     @InterceptorIgnore(tenantLine = "true")
     List<User> listByAlert();
+
+    /**
+     * 批量查询用户信息
+     * @param userIdList 用户ID集合
+     * @return
+     */
+    List<User> selectByUserIdList(@Param("userIdList") List<Integer> userIdList);
 }

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

@@ -263,5 +263,22 @@
     <select id="getById" resultType="com.gxwebsoft.common.system.entity.User">
         SELECT * FROM gxwebsoft_core.sys_user WHERE user_id = #{userId} and deleted = 0
     </select>
+    <select id="selectByUserIdList" resultType="com.gxwebsoft.common.system.entity.User">
+        SELECT
+            user_id,
+            username,
+            nickname,
+            phone,
+            real_name,
+            create_time
+        FROM
+            gxwebsoft_core.sys_user
+        WHERE
+            deleted = 0
+          AND user_id IN
+        <foreach collection="userIdList" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
 
 </mapper>

src/main/java/com/gxwebsoft/common/system/service/impl/SettingServiceImpl.java

@@ -143,7 +143,7 @@ public class SettingServiceImpl extends ServiceImpl<SettingMapper, Setting> impl
         final String apiV3key = jsonObject.getString("wechatApiKey");
         if(config == null){
           // 根据环境选择不同的证书路径配置
-          if ("dev".equals(activeProfile)) {
+          if ("local".equals(activeProfile)) {
             // 开发环境：使用配置文件的upload-path拼接证书路径 - 租户ID 10550
             System.out.println("=== 开发环境：使用配置文件upload-path拼接证书路径 ===");
             String uploadPath = pathConfig.getUploadPath(); // 获取配置的upload-path

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

@@ -9,6 +9,8 @@ import com.gxwebsoft.common.core.web.BatchParam;
 import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.User;
 import com.gxwebsoft.common.system.mapper.UserMapper;
+import com.gxwebsoft.glt.dto.GltTransferOrderDto;
+import com.gxwebsoft.glt.dto.NoticeRiderNewOrderDto;
 import com.gxwebsoft.glt.entity.GltTicketOrder;
 import com.gxwebsoft.glt.param.GltTicketOrderDeliveredParam;
 import com.gxwebsoft.glt.param.GltTicketOrderParam;
@@ -23,6 +25,7 @@ import cn.hutool.core.util.StrUtil;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
+import org.springdoc.api.annotations.ParameterObject;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -56,7 +59,7 @@ public class GltTicketOrderController extends BaseController {
 
     @Operation(summary = "分页查询送水订单")
     @GetMapping("/page")
-    public ApiResult<PageResult<GltTicketOrder>> page(GltTicketOrderParam param) {
+    public ApiResult<PageResult<GltTicketOrder>> page(@ParameterObject GltTicketOrderParam param) {
         // 使用关联查询
         return success(gltTicketOrderService.pageRel(param));
     }
@@ -176,14 +179,6 @@ public class GltTicketOrderController extends BaseController {
         }
 
         gltTicketOrderService.createWithWriteOff(gltTicketOrder, loginUser.getUserId(), loginUser.getTenantId());
-
-        // 订单创建成功后，异步通知所有在线配送员有新订单
-        try {
-            notifyRidersOfNewOrder(gltTicketOrder, loginUser.getTenantId());
-        } catch (Exception e) {
-            log.warn("通知配送员失败（不影响下单）: {}", e.getMessage());
-        }
-
         return success("下单成功");
     }
 
@@ -242,8 +237,14 @@ public class GltTicketOrderController extends BaseController {
                 }
             }
         }
+    }
 
-        log.info("已向 {} 位配送员发送新订单通知", riders.size());
+    @PreAuthorize("isAuthenticated()")
+    @Operation(summary = "配送员调度单通知")
+    @PostMapping("/sendRiderNewOrderNotice")
+    public ApiResult<?> sendRiderNewOrderNotice(@RequestBody NoticeRiderNewOrderDto noticeRiderNewOrderDto) {
+        gltSubscribeMessageService.sendRiderNewOrderNotice(noticeRiderNewOrderDto);
+        return success("发送消息成功！");
     }
 
     @PreAuthorize("isAuthenticated()")
@@ -260,6 +261,13 @@ public class GltTicketOrderController extends BaseController {
         return success("接单成功");
     }
 
+    @PreAuthorize("isAuthenticated()")
+    @Operation(summary = "配送员转单")
+    @PostMapping("/transferOrder")
+    public ApiResult<Boolean> transferOrder(@RequestBody GltTransferOrderDto orderDto) {
+        return success(gltTicketOrderService.transferOrder(orderDto));
+    }
+
     @PreAuthorize("isAuthenticated()")
     @Operation(summary = "配送员开始配送")
     @PostMapping("/{id}/start")
@@ -291,6 +299,13 @@ public class GltTicketOrderController extends BaseController {
         return success("确认送达");
     }
 
+    @Operation(summary = "订单调度")
+    @PostMapping("/dispatchOrder")
+    public ApiResult<?> dispatchOrder(@RequestParam("orderNo") String orderNo, @RequestParam("tenantId") Integer tenantId) {
+        gltTicketOrderService.dispatchOrder(orderNo, tenantId);
+        return success("success!");
+    }
+
     @PreAuthorize("isAuthenticated()")
     @Operation(summary = "用户确认收货")
     @PostMapping("/{id}/confirm-receive")
@@ -374,23 +389,14 @@ public class GltTicketOrderController extends BaseController {
         }
 
         if (gltTicketOrderService.updateById(gltTicketOrder)) {
-            // 后台指派配送员（直接改 riderId）时，同步商城订单为“已发货”(deliveryStatus=20)
+                gltTicketOrderService.markShopOrderShippedAfterRiderAssigned(gltTicketOrder.getId(), tenantId, gltTicketOrder.getRiderId());
-            if (gltTicketOrder != null
+
-                    && gltTicketOrder.getId() != null
-                    && gltTicketOrder.getRiderId() != null
-                    && gltTicketOrder.getRiderId() > 0) {
-                gltTicketOrderService.markShopOrderShippedAfterRiderAssigned(
-                        gltTicketOrder.getId(),
-                        tenantId,
-                        gltTicketOrder.getRiderId()
-                );
-            }
             // 后台直接改“已完成”(deliveryStatus=40)时，同步商城订单为“已完成”(orderStatus=1)
             if (gltTicketOrder != null
                     && gltTicketOrder.getId() != null
                     && gltTicketOrder.getDeliveryStatus() != null
                     && gltTicketOrder.getDeliveryStatus() == GltTicketOrderService.DELIVERY_STATUS_FINISHED) {
-                gltTicketOrderService.markShopOrderCompletedAfterTicketFinished(gltTicketOrder.getId(), tenantId);
+                gltTicketOrderService.markShopOrderCompletedAfterTicketFinished(gltTicketOrder.getId());
             }
             return success("修改成功");
         }

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

@@ -79,6 +79,7 @@ public class GltTicketTemplateController extends BaseController {
          User loginUser = getLoginUser();
          if (loginUser != null) {
          gltTicketTemplate.setUserId(loginUser.getUserId());
+         gltTicketTemplate.setTenantId(loginUser.getTenantId());
          }
         if (gltTicketTemplateService.save(gltTicketTemplate)) {
             return success("添加成功");

src/main/java/com/gxwebsoft/glt/dto/GltTransferOrderDto.java

@@ -0,0 +1,25 @@
+package com.gxwebsoft.glt.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * 转单请求类
+ *
+ */
+@Data
+@Schema(name = "ShopOrderMyVerifyDto", description = "转单请求类")
+public class GltTransferOrderDto {
+
+    @Schema(description = "订单ID")
+    @NotEmpty(message = "订单ID不能为空！")
+    private Integer id;
+
+    @Schema(description = "转单用户ID")
+    @NotEmpty(message = "转单用户ID不能为空！")
+    private Integer userId;
+
+}
+

src/main/java/com/gxwebsoft/glt/dto/NoticeRiderNewOrderDto.java

@@ -0,0 +1,35 @@
+package com.gxwebsoft.glt.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+/**
+ * 配送员新订单配送通知
+ *
+ */
+@Data
+@Schema(name = "ShopOrderMyVerifyDto", description = "配送员新订单配送通知")
+public class NoticeRiderNewOrderDto {
+
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    @Schema(description = "商品名称")
+    private String goodsName;
+
+    @Schema(description = "配送数量")
+    private Integer productCount;
+
+    @Schema(description = "期望送达时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "租户ID")
+    private Integer tenantId;
+
+    @Schema(description = "openID")
+    private String openId;
+
+}
+

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

@@ -33,7 +33,6 @@ public class GltTicketOrder implements Serializable {
     private Integer userTicketId;
 
     @Schema(description = "关联订单编号")
-    @TableField(exist = false)
     private String orderNo;
 
     @Schema(description = "订单状态")
@@ -47,6 +46,10 @@ public class GltTicketOrder implements Serializable {
     @TableField(exist = false)
     private String storeName;
 
+    @Schema(description = "品名")
+    @TableField(exist = false)
+    private String goodsName;
+
     @Schema(description = "门店地址")
     @TableField(exist = false)
     private String storeAddress;
@@ -214,6 +217,9 @@ public class GltTicketOrder implements Serializable {
     @Schema(description = "状态, 0正常, 1冻结")
     private Integer status;
 
+    @Schema(description = "水票标识 0-非 1-是")
+    private Integer waterTicketFlag;
+
     @Schema(description = "是否删除, 0否, 1是")
     @TableLogic
     private Integer deleted;

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

@@ -11,7 +11,7 @@
         d.name as receiverName, d.phone as receiverPhone,
         d.province as receiverProvince, d.city as receiverCity, d.region as receiverRegion,
         d.address as receiverAddress, d.full_address as receiverFullAddress, d.lat as receiverLat, d.lng as receiverLng,
-        COALESCE(o.order_no, f.order_no) as orderNo, o.order_status as orderStatus
+        COALESCE(o.order_no, a.order_no) as orderNo, o.order_status as orderStatus
         FROM glt_ticket_order a
         LEFT JOIN shop_store b ON a.store_id = b.id
         LEFT JOIN shop_store_warehouse w ON a.warehouse_id = w.id
@@ -20,7 +20,6 @@
         LEFT JOIN shop_user_address d ON a.address_id = d.id
         LEFT JOIN glt_user_ticket f ON a.user_ticket_id = f.id
         LEFT JOIN shop_order o ON f.order_id = o.order_id AND f.tenant_id = o.tenant_id AND o.deleted = 0
-
         <where>
             <if test="param.id != null">
                 AND a.id = #{param.id}
@@ -88,7 +87,7 @@
                 AND a.create_time &lt;= #{param.createTimeEnd}
             </if>
             <if test="param.orderNo != null">
-                AND (a.id = #{param.orderNo} OR COALESCE(o.order_no, f.order_no) = #{param.orderNo})
+                AND (a.id = #{param.orderNo} OR COALESCE(o.order_no, a.order_no) = #{param.orderNo})
             </if>
             <if test="param.phone != null">
                 AND u.phone = #{param.phone}
@@ -103,6 +102,12 @@
                     OR u.phone LIKE CONCAT('%', #{param.keywords}, '%')
                 )
             </if>
+            <if test="param.waterTicketFlag != null">
+                AND a.water_ticket_flag = #{param.waterTicketFlag}
+            </if>
+            <if test="param.deliveryStatus != null and param.deliveryStatus == 10">
+                AND o.order_status in (0, 1, 5)
+            </if>
         </where>
     </sql>
 

src/main/java/com/gxwebsoft/glt/param/GltTicketOrderParam.java

@@ -94,4 +94,7 @@ public class GltTicketOrderParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer orderStatus;
 
+    @Schema(description = "水票订单标识 0-否 1-是")
+    private Integer waterTicketFlag;
+
 }

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

@@ -1,5 +1,6 @@
 package com.gxwebsoft.glt.service;
 
+import com.gxwebsoft.glt.dto.NoticeRiderNewOrderDto;
 import com.gxwebsoft.glt.entity.GltTicketOrder;
 
 /**
@@ -25,4 +26,10 @@ public interface GltSubscribeMessageService {
      * @return 是否发送成功
      */
     boolean sendOrderStatusNotice(GltTicketOrder order, String riderOpenId, String statusText, Integer tenantId);
+
+    /**
+     * 推送配送师傅接单提醒
+     * @param noticeRiderNewOrderDto
+     */
+    void sendRiderNewOrderNotice(NoticeRiderNewOrderDto noticeRiderNewOrderDto);
 }

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

@@ -1,10 +1,7 @@
 package com.gxwebsoft.glt.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.gxwebsoft.glt.entity.GltTicketTemplate;
+import com.gxwebsoft.glt.entity.*;
-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;
@@ -18,6 +15,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionTemplate;
 
+import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -37,6 +35,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
 @RequiredArgsConstructor
 public class GltTicketIssueService {
 
+    @Resource
+    private GltTicketOrderService gltTicketOrderService;
+
     public static final int CHANGE_TYPE_ISSUE = 10;
 
     private enum IssueOutcome {
@@ -144,6 +145,9 @@ public class GltTicketIssueService {
 
         //3.执行平台分红业务 TODO 待开发
 
+        //4.普通商品【非水票订单】如果是需要自配送的，则会同步生成派单信息
+        gltTicketOrderService.dispatchOrder(orderNo, tenantId);
+
     }
 
     /**

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

@@ -2,6 +2,7 @@ package com.gxwebsoft.glt.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.glt.dto.GltTransferOrderDto;
 import com.gxwebsoft.glt.entity.GltTicketOrder;
 import com.gxwebsoft.glt.param.GltTicketOrderParam;
 
@@ -64,6 +65,13 @@ public interface GltTicketOrderService extends IService<GltTicketOrder> {
      */
     void accept(Integer id, Integer riderId, Integer tenantId);
 
+    /**
+     * 配送员转单
+     * @param orderDto
+     * @return
+     */
+    Boolean transferOrder(GltTransferOrderDto orderDto);
+
     /**
      * 指派/接单成功后，同步关联商城订单发货状态为“已发货”(deliveryStatus=20)。
      *
@@ -76,7 +84,7 @@ public interface GltTicketOrderService extends IService<GltTicketOrder> {
      *
      * <p>用于后台直接改 deliveryStatus=40 等不经过 confirmReceive/autoConfirmTimeout 的兜底同步。</p>
      */
-    void markShopOrderCompletedAfterTicketFinished(Integer ticketOrderId, Integer tenantId);
+    void markShopOrderCompletedAfterTicketFinished(Integer id);
 
     /**
      * 配送员开始配送：10 -> 20，并写 sendStartTime。
@@ -106,4 +114,10 @@ public interface GltTicketOrderService extends IService<GltTicketOrder> {
      */
     int autoConfirmTimeout(Integer tenantId, LocalDateTime now, int timeoutHours, int batchSize);
 
+    /**
+     * 派送订单调度
+     * @return
+     */
+    Boolean dispatchOrder(String orderNo, Integer tenantId);
+
 }

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

@@ -1,14 +1,12 @@
 package com.gxwebsoft.glt.service.impl;
 
-import cn.binarywang.wx.miniapp.api.WxMaService;
-import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
-import cn.binarywang.wx.miniapp.config.WxMaConfig;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gxwebsoft.common.core.exception.BusinessException;
-import com.gxwebsoft.common.core.utils.RedisUtil;
+import com.gxwebsoft.common.core.utils.DateTimeUtil;
+import com.gxwebsoft.glt.dto.NoticeRiderNewOrderDto;
 import com.gxwebsoft.glt.entity.GltTicketOrder;
 import com.gxwebsoft.glt.service.GltSubscribeMessageService;
 import lombok.extern.slf4j.Slf4j;
@@ -19,7 +17,8 @@ import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.gxwebsoft.common.core.constants.RedisConstants.*;
+import static com.gxwebsoft.common.core.constants.RedisConstants.ACCESS_TOKEN_KEY;
+import static com.gxwebsoft.common.core.constants.RedisConstants.MP_WX_KEY;
 
 /**
  * 微信订阅消息服务实现
@@ -43,7 +42,34 @@ public class GltSubscribeMessageServiceImpl implements GltSubscribeMessageServic
      * 模板名称：订单配送通知
      * 关键词：订单编号、订单内容、配送地址、订单金额
      */
-    private static final String SUBSCRIBE_TEMPLATE_ID = "YOUR_TEMPLATE_ID"; // TODO: 替换为实际模板ID
+    private static final String ORDER_DELIVERY_ID = "vSMSqGVy3aG1RuzQUZlk282p5hCvuMBcHvix1AFhN90";
+
+
+    public void sendRiderNewOrderNotice(NoticeRiderNewOrderDto entity){
+        //1.获取微信accessToken
+        String accessToken = getAccessToken(entity.getTenantId());
+        if(accessToken == null){
+            log.error("配送发单消息发生失败：获取accessToken失败！");
+            return;
+        }
+
+        //2.品名字段最大能发送20个长度字符，大于15的长度需做处理
+        String goodsName = entity.getGoodsName();
+        int keepLength = 15;
+        if (goodsName.length() > keepLength) {
+            entity.setGoodsName(goodsName.substring(0, keepLength) + "...");
+        }
+
+        //3.组装入参
+        Map<String, Object> data = new HashMap<>();
+        data.put("character_string1", Map.of("value", String.valueOf(entity.getOrderNo())));
+        data.put("thing22", Map.of("value", String.valueOf(entity.getGoodsName())));
+        data.put("number20", Map.of("value", String.valueOf(entity.getProductCount())));
+        data.put("time24", Map.of("value", DateTimeUtil.formatDateTime(entity.getCreateTime(), "yyyy-MM-dd HH:mm:ss")));
+
+        //推送订阅消息
+        sendSubscribeMessage(accessToken, entity.getOpenId(), data);
+    }
 
     /**
      * 发送新订单通知给配送员
@@ -65,7 +91,7 @@ public class GltSubscribeMessageServiceImpl implements GltSubscribeMessageServic
             // 构建消息内容
             Map<String, Object> data = new HashMap<>();
             data.put("phrase1", Map.of("value", "待配送"));  // 订单状态
-            data.put("character_string2", Map.of("value", String.valueOf(order.getId()))); // 订单编号
+            data.put("character_string2", Map.of("value", String.valueOf(order.getOrderNo()))); // 订单编号
             data.put("thing3", Map.of("value", truncateStr(order.getAddress(), 20))); // 配送地址
             data.put("number4", Map.of("value", String.valueOf(order.getTotalNum()))); // 商品数量
             data.put("time5", Map.of("value", formatTime(order.getSendTime()))); // 期望送达时间
@@ -196,8 +222,8 @@ public class GltSubscribeMessageServiceImpl implements GltSubscribeMessageServic
 
         Map<String, Object> params = new HashMap<>();
         params.put("touser", openId);           // 用户 openid
-        params.put("template_id", SUBSCRIBE_TEMPLATE_ID); // 模板ID
+        params.put("template_id", ORDER_DELIVERY_ID); // 模板ID
-        params.put("page", "pages/rider/orders/index");    // 点击后跳转的页面
+//        params.put("page", "pages/rider/orders/index");    // 点击后跳转的页面
         params.put("data", data);
 
         String response = HttpUtil.createPost(url)
@@ -208,14 +234,14 @@ public class GltSubscribeMessageServiceImpl implements GltSubscribeMessageServic
                 .body();
 
         JSONObject result = JSON.parseObject(response);
-        int errcode = result.getIntValue("errcode");
+        int errCode = result.getIntValue("errcode");
 
-        if (errcode == 0) {
+        if (errCode == 0) {
             log.info("订阅消息发送成功 - openId={}", openId);
             return true;
         } else {
             log.warn("订阅消息发送失败 - openId={}, errcode={}, errmsg={}",
-                    openId, errcode, result.getString("errmsg"));
+                    openId, errCode, result.getString("errmsg"));
             return false;
         }
     }

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

@@ -1,5 +1,6 @@
 package com.gxwebsoft.glt.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -7,41 +8,52 @@ 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.exception.enums.GlobalErrorCodeConstants;
+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.glt.dto.GltTransferOrderDto;
+import com.gxwebsoft.glt.dto.NoticeRiderNewOrderDto;
 import com.gxwebsoft.glt.entity.GltTicketOrder;
 import com.gxwebsoft.glt.entity.GltUserTicket;
 import com.gxwebsoft.glt.entity.GltUserTicketLog;
 import com.gxwebsoft.glt.mapper.GltTicketOrderMapper;
 import com.gxwebsoft.glt.mapper.GltUserTicketMapper;
 import com.gxwebsoft.glt.param.GltTicketOrderParam;
+import com.gxwebsoft.glt.service.GltSubscribeMessageService;
 import com.gxwebsoft.glt.service.GltTicketOrderService;
 import com.gxwebsoft.glt.service.GltUserTicketLogService;
 import com.gxwebsoft.glt.service.GltUserTicketService;
 import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto;
 import com.gxwebsoft.shop.entity.*;
+import com.gxwebsoft.shop.mapper.ShopGoodsMapper;
+import com.gxwebsoft.shop.mapper.ShopStoreRiderMapper;
 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 com.gxwebsoft.shop.vo.ShopOrderGoodsInfoVO;
 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;
 import org.springframework.transaction.support.TransactionTemplate;
+import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -93,22 +105,47 @@ public class GltTicketOrderServiceImpl extends ServiceImpl<GltTicketOrderMapper,
     @Resource
     private OrderNoUtils orderNoUtils;
 
+    @Resource
+    private ShopGoodsMapper shopGoodsMapper;
+
+    @Resource
+    private ShopStoreRiderMapper shopStoreRiderMapper;
+
+    @Resource
+    private GltSubscribeMessageService gltSubscribeMessageService;
+
+    // 轮询指针（高并发安全）
+    private final AtomicInteger index = new AtomicInteger(0);
+
     @Override
     public PageResult<GltTicketOrder> pageRel(GltTicketOrderParam param) {
         PageParam<GltTicketOrder, GltTicketOrderParam> page = new PageParam<>(param);
-        page.setDefaultOrder("sort_number asc, create_time desc");
+        page.setDefaultOrder("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);
+            List<String> orderNoList = list.stream().filter(gltTicketOrder -> StrUtil.isNotBlank(gltTicketOrder.getOrderNo())).map(GltTicketOrder::getOrderNo).distinct().collect(Collectors.toList());
-            if(CollectionUtils.isNotEmpty(userAddressList)){
+            List<ShopOrderGoodsInfoVO> orderGoodsInfoVOList = new ArrayList<>();
-                list.forEach(ticketOrder ->{
+            if(CollectionUtils.isNotEmpty(orderNoList)){
-                    ShopUserAddress shopUserAddress = userAddressList.stream().filter(address -> ticketOrder.getAddressId().equals(address.getId())).findFirst().orElse(null);
+                orderGoodsInfoVOList = shopOrderService.getOrderGoodsInfoByOrderNos(orderNoList);
-                    if(shopUserAddress != null){
-                        ticketOrder.setFullAddress(shopUserAddress.getFullAddress());
-                    }
-                });
             }
+
+            List<ShopUserAddress> userAddressList = shopUserAddressMapper.selectBatchIds(addressIdList);
+            List<ShopOrderGoodsInfoVO> finalOrderGoodsInfoVOList = orderGoodsInfoVOList;
+            list.forEach(ticketOrder ->{
+                ShopUserAddress shopUserAddress = userAddressList.stream().filter(address -> ticketOrder.getAddressId().equals(address.getId())).findFirst().orElse(null);
+                if(shopUserAddress != null){
+                    ticketOrder.setFullAddress(shopUserAddress.getFullAddress());
+                }
+
+                if(StrUtil.isNotBlank(ticketOrder.getOrderNo())){
+                    ShopOrderGoodsInfoVO shopOrderGoodsInfoVO = finalOrderGoodsInfoVOList.stream().filter(orderGoodsInfoVO -> ticketOrder.getOrderNo().equals(orderGoodsInfoVO.getOrderNo())).findFirst().orElse(null);
+                    if(shopOrderGoodsInfoVO != null){
+                        ticketOrder.setGoodsName(shopOrderGoodsInfoVO.getGoodsName());
+                        ticketOrder.setOrderStatus(shopOrderGoodsInfoVO.getOrderStatus());
+                    }
+                }
+            });
         }
         return new PageResult<>(list, page.getTotal());
     }
@@ -177,6 +214,7 @@ public class GltTicketOrderServiceImpl extends ServiceImpl<GltTicketOrderMapper,
         }
 
         // 4) 插入 glt_ticket_order（storeId/addressId/totalNum/buyerRemarks…）
+        gltTicketOrder.setOrderNo(userTicket.getOrderNo());
         gltTicketOrder.setUserId(userId);
         // 订单基础字段由后端兜底，避免前端误传/恶意传参
         gltTicketOrder.setStatus(0);
@@ -194,10 +232,13 @@ public class GltTicketOrderServiceImpl extends ServiceImpl<GltTicketOrderMapper,
             gltTicketOrder.setCreateTime(now);
         }
         // “立刻送水”下单场景不再需要前端选择配送时间；若未传则默认当前时间，便于排序与派单。
-        if (!StringUtils.hasText(gltTicketOrder.getSendTime())) {
+        if(gltTicketOrder.getSendEndTime() == null){
             gltTicketOrder.setSendTime(now.format(SEND_TIME_FMT));
         }
+
         gltTicketOrder.setUpdateTime(now);
+        //每个骑手平等获取派单
+        gltTicketOrder.setRiderId(getRiderUserId());
         if (!this.save(gltTicketOrder)) {
             throw new BusinessException("创建订单失败");
         }
@@ -233,6 +274,29 @@ public class GltTicketOrderServiceImpl extends ServiceImpl<GltTicketOrderMapper,
             throw new BusinessException("写入核销记录失败");
         }
 
+        //发送配送师傅派单配送消息
+        if(gltTicketOrder.getRiderId() != null){
+            User user = userMapper.getById(gltTicketOrder.getRiderId());
+            if(user != null){
+                NoticeRiderNewOrderDto noticeDto = new NoticeRiderNewOrderDto();
+                noticeDto.setOrderNo(gltTicketOrder.getOrderNo());
+                noticeDto.setGoodsName("商品信息见订单详情");
+                noticeDto.setProductCount(gltTicketOrder.getTotalNum());
+                noticeDto.setCreateTime(gltTicketOrder.getCreateTime());
+                noticeDto.setTenantId(tenantId);
+                noticeDto.setOpenId(user.getOpenid());
+
+                ShopOrder shopOrder = shopOrderService.getByOrderNo(gltTicketOrder.getOrderNo(), tenantId);
+                if(shopOrder != null){
+                    Integer formId = shopOrder.getFormId();
+                    ShopGoods shopGoods = shopGoodsMapper.selectById(formId);
+                    if(shopGoods != null){
+                        noticeDto.setGoodsName(shopGoods.getName());
+                    }
+                }
+                gltSubscribeMessageService.sendRiderNewOrderNotice(noticeDto);
+            }
+        }
         return gltTicketOrder;
     }
 
@@ -300,7 +364,7 @@ public class GltTicketOrderServiceImpl extends ServiceImpl<GltTicketOrderMapper,
                 .update();
         if (ok) {
             // 接单成功后，同步商城订单发货状态：10未发货 -> 20已发货
-            updateShopOrderDeliveryStatusAfterAccept(id, tenantId, riderId, now);
+            updateShopOrderDeliveryStatusAfterAcceptV2(id, tenantId, riderId, now);
             return;
         }
 
@@ -320,13 +384,34 @@ public class GltTicketOrderServiceImpl extends ServiceImpl<GltTicketOrderMapper,
     }
 
     @Override
-    public void markShopOrderShippedAfterRiderAssigned(Integer ticketOrderId, Integer tenantId, Integer riderId) {
+    public Boolean transferOrder(GltTransferOrderDto orderDto) {
-        updateShopOrderDeliveryStatusAfterAccept(ticketOrderId, tenantId, riderId, LocalDateTime.now());
+        User loginUser = LoginUserUtil.getLoginUser();
+        if(loginUser == null){
+            throw new BusinessException(GlobalErrorCodeConstants.UNAUTHORIZED.getMsg());
+        }
+
+        GltTicketOrder gltTicketOrder = baseMapper.selectById(orderDto.getId());
+        if(gltTicketOrder != null){
+            if(!gltTicketOrder.getRiderId().equals(loginUser.getUserId())){
+                throw new BusinessException("该订单归属非本人，转单操作失败！");
+            }
+            gltTicketOrder.setRiderId(orderDto.getUserId());
+            gltTicketOrder.setUpdateTime(LocalDateTime.now());
+
+            return baseMapper.updateById(gltTicketOrder) > 0;
+        }else {
+            throw new BusinessException(GlobalErrorCodeConstants.NOT_FOUND.getMsg());
+        }
     }
 
     @Override
-    public void markShopOrderCompletedAfterTicketFinished(Integer ticketOrderId, Integer tenantId) {
+    public void markShopOrderShippedAfterRiderAssigned(Integer ticketOrderId, Integer tenantId, Integer riderId) {
-        updateShopOrderOrderStatusAfterTicketFinished(ticketOrderId, tenantId, LocalDateTime.now());
+        updateShopOrderDeliveryStatusAfterAcceptV2(ticketOrderId, tenantId, riderId, LocalDateTime.now());
+    }
+
+    @Override
+    public void markShopOrderCompletedAfterTicketFinished(Integer id) {
+        updateShopOrderOrderStatusAfterTicketFinishedV2(id);
     }
 
     private void updateShopOrderDeliveryStatusAfterAccept(Integer ticketOrderId, Integer tenantId, Integer riderId, LocalDateTime now) {
@@ -396,22 +481,6 @@ public class GltTicketOrderServiceImpl extends ServiceImpl<GltTicketOrderMapper,
                     shopOrderNo = order.getOrderNo();
                 }
             }
-
-            LambdaUpdateWrapper<GltUserTicket> backfill = new LambdaUpdateWrapper<GltUserTicket>()
-                .eq(GltUserTicket::getTenantId, tenantId)
-                .eq(GltUserTicket::getDeleted, 0)
-                .eq(GltUserTicket::getId, userTicket.getId());
-            backfill.set(GltUserTicket::getOrderId, shopOrderId);
-            if (!StringUtils.hasText(userTicket.getOrderNo()) && StringUtils.hasText(shopOrderNo)) {
-                backfill.set(GltUserTicket::getOrderNo, shopOrderNo);
-            }
-            backfill.set(GltUserTicket::getUpdateTime, now);
-            try {
-                gltUserTicketService.update(backfill);
-            } catch (Exception e) {
-                log.debug("回填水票关联商城订单信息失败(不影响主流程) - tenantId={}, userTicketId={}, orderId={}, orderNo={}",
-                    tenantId, userTicket.getId(), shopOrderId, shopOrderNo, e);
-            }
         }
 
         LambdaUpdateWrapper<ShopOrder> uw = new LambdaUpdateWrapper<ShopOrder>()
@@ -459,6 +528,20 @@ public class GltTicketOrderServiceImpl extends ServiceImpl<GltTicketOrderMapper,
         }
     }
 
+    private void updateShopOrderDeliveryStatusAfterAcceptV2(Integer ticketOrderId, Integer tenantId, Integer riderId, LocalDateTime now) {
+        GltTicketOrder gltTicketOrder = baseMapper.selectById(ticketOrderId);
+        if(gltTicketOrder != null && StrUtil.isNotBlank(gltTicketOrder.getOrderNo())){
+            String orderNo = gltTicketOrder.getOrderNo();
+
+            ShopOrder shopOrder = shopOrderService.getByOrderNo(orderNo, tenantId);
+            if(shopOrder != null && shopOrder.getOrderStatus() == 0){
+                shopOrder.setDeliveryStatus(20);
+                shopOrder.setUpdateTime(now);
+                shopOrderService.updateById(shopOrder);
+            }
+        }
+    }
+
     @Override
     public void start(Integer id, Integer riderId, Integer tenantId) {
         if (id == null) {
@@ -682,7 +765,80 @@ public class GltTicketOrderServiceImpl extends ServiceImpl<GltTicketOrderMapper,
         return confirmed;
     }
 
-    private void updateShopOrderOrderStatusAfterTicketFinished(Integer ticketOrderId, Integer tenantId, LocalDateTime now) {
+    @Override
+    public Boolean dispatchOrder(String orderNo, Integer tenantId) {
+        ShopOrder shopOrder = shopOrderService.getByOrderNo(orderNo, tenantId);
+        if(shopOrder != null){
+            LocalDateTime now = LocalDateTime.now();
+            //只有:1-及时自配送、3-预约自配送 方式会生成调度单
+            if(Arrays.asList(1, 3).contains(shopOrder.getOrderType())){
+                GltTicketOrder dispatchOrder = BeanUtil.toBean(shopOrder, GltTicketOrder.class);
+
+                String no = orderNoUtils.generate("S");
+                dispatchOrder.setNo(no);
+                dispatchOrder.setRiderId(getRiderUserId());
+                dispatchOrder.setSendTime(now.format(SEND_TIME_FMT));
+                Integer deliveryMethod = shopOrder.getDeliveryMethod();
+                if(deliveryMethod != null && deliveryMethod == 1){
+                    dispatchOrder.setDeliveryMethod("stairs");
+                }else {
+                    dispatchOrder.setDeliveryMethod("elevator");
+                }
+                dispatchOrder.setComments("系统自动派单");
+                dispatchOrder.setCreateTime(now);
+                dispatchOrder.setUpdateTime(now);
+
+                baseMapper.insert(dispatchOrder);
+
+                //推送配送师傅接单提醒
+                if(dispatchOrder.getRiderId() != null){
+                    User user = userMapper.getById(dispatchOrder.getRiderId());
+                    if(user != null){
+                        NoticeRiderNewOrderDto noticeDto = new NoticeRiderNewOrderDto();
+                        noticeDto.setOrderNo(dispatchOrder.getOrderNo());
+                        noticeDto.setGoodsName("商品信息见订单详情");
+                        noticeDto.setProductCount(dispatchOrder.getTotalNum());
+                        noticeDto.setCreateTime(dispatchOrder.getCreateTime());
+                        noticeDto.setTenantId(tenantId);
+                        noticeDto.setOpenId(user.getOpenid());
+
+                        if(shopOrder != null){
+                            Integer formId = shopOrder.getFormId();
+                            ShopGoods shopGoods = shopGoodsMapper.selectById(formId);
+                            if(shopGoods != null){
+                                noticeDto.setGoodsName(shopGoods.getName());
+                            }
+                        }
+                        gltSubscribeMessageService.sendRiderNewOrderNotice(noticeDto);
+                    }
+                }
+            }
+        }
+        return Boolean.TRUE;
+    }
+
+    /**
+     * 每个骑手平等获取派单
+     * @return
+     */
+    private Integer getRiderUserId(){
+        List<ShopStoreRider> shopStoreRiders = shopStoreRiderMapper.selectList(new LambdaQueryWrapper<ShopStoreRider>().select(ShopStoreRider::getUserId).in(ShopStoreRider::getWorkStatus, Arrays.asList(1, 2)));
+        if(CollectionUtils.isNotEmpty(shopStoreRiders)){
+            List<Integer> riderIdList = shopStoreRiders.stream().map(ShopStoreRider::getUserId).distinct().collect(Collectors.toList());
+            int i = index.getAndIncrement() % riderIdList.size();
+            return riderIdList.get(i);
+        }
+        return null;
+    }
+
+    /**
+     * 更新送水订单为已完成状态
+     * @param ticketOrderId
+     * @param tenantId
+     * @param now
+     */
+    @Transactional
+    public void updateShopOrderOrderStatusAfterTicketFinished(Integer ticketOrderId, Integer tenantId, LocalDateTime now) {
         if (ticketOrderId == null || tenantId == null) {
             return;
         }
@@ -692,7 +848,8 @@ public class GltTicketOrderServiceImpl extends ServiceImpl<GltTicketOrderMapper,
 
         // 找到关联水票的商城订单（glt_user_ticket.orderId / orderNo）
         GltTicketOrder ticketOrder = this.lambdaQuery()
-            .select(GltTicketOrder::getId, GltTicketOrder::getUserTicketId)
+            .select(GltTicketOrder::getId, GltTicketOrder::getUserTicketId, GltTicketOrder::getTotalNum, GltTicketOrder::getRiderId,
+                    GltTicketOrder::getUserId, GltTicketOrder::getNo)
             .eq(GltTicketOrder::getId, ticketOrderId)
             .eq(GltTicketOrder::getTenantId, tenantId)
             .eq(GltTicketOrder::getDeleted, 0)
@@ -768,15 +925,70 @@ public class GltTicketOrderServiceImpl extends ServiceImpl<GltTicketOrderMapper,
             }
         }
 
-        //查询未完成订单，完成资金解冻
+        ShopOrder order = shopOrderService.getByOrderNo(userTicket.getOrderNo(), userTicket.getTenantId());
-        LambdaQueryWrapper<ShopOrder> orderLambdaQueryWrapper;
+        //生成配送师傅可提现账户分佣金额数据【配送奖励(按商品设置)、配送提成(每桶0.1)】
-        if(shopOrderId != null){
+        int qty = ticketOrder.getTotalNum() == null ? 0 : ticketOrder.getTotalNum();
-            orderLambdaQueryWrapper = new LambdaQueryWrapper<ShopOrder>().eq(ShopOrder::getOrderId, shopOrderId).eq(ShopOrder::getOrderStatus, 0);
+        if (qty > 0) {  //配送提成(每桶0.1)
-        }else{
+            BigDecimal money = RIDER_UNIT_COMMISSION
-            orderLambdaQueryWrapper = new LambdaQueryWrapper<ShopOrder>().eq(ShopOrder::getOrderId, shopOrderNo).eq(ShopOrder::getOrderStatus, 0);
+                    .multiply(BigDecimal.valueOf(qty))
+                    .setScale(RIDER_COMMISSION_SCALE, RoundingMode.HALF_UP);
+            if (money.signum() > 0) {
+                ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto();
+                reduceDto.setTypeEnum(ShopDealerTypeEnum.WITHDRAW_ACCOUNT);
+                reduceDto.setUserId(ticketOrder.getRiderId());
+                reduceDto.setOrderUserId(ticketOrder.getUserId());
+                if(Arrays.asList(1, 3).contains(order.getOrderType())){
+                    reduceDto.setOrderNo(order.getOrderNo());
+                }else {
+                    reduceDto.setOrderNo(ticketOrder.getNo());
+                }
+                reduceDto.setPrice(money);
+                reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.DELIVERY_INCOME);
+                shopDealerUserService.reduceBalance(reduceDto);
+            }
         }
-        ShopOrder order = shopOrderService.getOne(orderLambdaQueryWrapper);
+
-        if(order != null){
+        //配送奖励(按商品设置)
+        Integer goodsId = userTicket.getGoodsId();
+        ShopGoods shopGood = shopGoodsMapper.selectById(goodsId);
+        if(shopGood != null && order != null){
+            Integer commissionType = shopGood.getCommissionType();
+            BigDecimal money = BigDecimal.ZERO;
+            if(commissionType == 10){   //按金额
+                money = shopGood.getDeliveryMoney();
+            }else { //按比率
+                money = order.getPayPrice().multiply(shopGood.getDeliveryMoney()).divide(BigDecimal.valueOf(100), 3, RoundingMode.HALF_UP);
+            }
+            if(money.compareTo(BigDecimal.ZERO) > 0){
+                ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto();
+                reduceDto.setTypeEnum(ShopDealerTypeEnum.WITHDRAW_ACCOUNT);
+                reduceDto.setUserId(ticketOrder.getRiderId());
+                reduceDto.setOrderUserId(ticketOrder.getUserId());
+                if(Arrays.asList(1, 3).contains(order.getOrderType())){
+                    reduceDto.setOrderNo(order.getOrderNo());
+                }else {
+                    reduceDto.setOrderNo(ticketOrder.getNo());
+                }
+                reduceDto.setPrice(money);
+                reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.DELIVERY_REWARD);
+                shopDealerUserService.reduceBalance(reduceDto);
+            }
+        }
+
+        //配送费结算
+        if(Arrays.asList(1, 3).contains(order.getOrderType()) && order.getDeliveryFee().compareTo(BigDecimal.ZERO) > 0){
+            ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto();
+            reduceDto.setTypeEnum(ShopDealerTypeEnum.WITHDRAW_ACCOUNT);
+            reduceDto.setUserId(ticketOrder.getRiderId());
+            reduceDto.setOrderUserId(ticketOrder.getUserId());
+            reduceDto.setOrderNo(order.getOrderNo());
+            reduceDto.setPrice(order.getDeliveryFee());
+            reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.DELIVERY_FLOOR_FEE);
+            shopDealerUserService.reduceBalance(reduceDto);
+        }
+
+        //查询未完成订单，完成资金解冻
+        if(order != null && order.getOrderStatus() == 0){
             ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto();
             reduceDto.setTypeEnum(ShopDealerTypeEnum.DEFROST);
             reduceDto.setOrderUserId(order.getUserId());
@@ -819,6 +1031,104 @@ public class GltTicketOrderServiceImpl extends ServiceImpl<GltTicketOrderMapper,
         }
     }
 
+    /**
+     * 更新送水订单为已完成状态
+     * @param id 送水订单ID
+     */
+    @Transactional
+    public void updateShopOrderOrderStatusAfterTicketFinishedV2(Integer id) {
+        LocalDateTime now = LocalDateTime.now();
+        if(id == null){
+            return;
+        }
+
+        //1.找到关联水票的商城订单
+        GltTicketOrder ticketOrder = baseMapper.selectById(id);
+        if (ticketOrder == null) {
+            return;
+        }
+
+        ShopOrder order = shopOrderService.getByOrderNo(ticketOrder.getOrderNo(), ticketOrder.getTenantId());
+        //2.配送提成(每桶0.1)
+        int qty = ticketOrder.getTotalNum() == null ? 0 : ticketOrder.getTotalNum();
+        if (qty > 0) {
+            BigDecimal money = RIDER_UNIT_COMMISSION
+                    .multiply(BigDecimal.valueOf(qty))
+                    .setScale(RIDER_COMMISSION_SCALE, RoundingMode.HALF_UP);
+            if (money.signum() > 0) {
+                ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto();
+                reduceDto.setTypeEnum(ShopDealerTypeEnum.WITHDRAW_ACCOUNT);
+                reduceDto.setUserId(ticketOrder.getRiderId());
+                reduceDto.setOrderUserId(ticketOrder.getUserId());
+                if(Arrays.asList(1, 3).contains(order.getOrderType())){
+                    reduceDto.setOrderNo(order.getOrderNo());
+                }else {
+                    reduceDto.setOrderNo(ticketOrder.getNo());
+                }
+                reduceDto.setPrice(money);
+                reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.DELIVERY_INCOME);
+                shopDealerUserService.reduceBalance(reduceDto);
+            }
+        }
+
+        //3.配送奖励(按商品设置)
+        Integer goodsId = order.getFormId();
+        ShopGoods shopGood = shopGoodsMapper.selectById(goodsId);
+        if(shopGood != null && order != null){
+            Integer commissionType = shopGood.getCommissionType();
+            BigDecimal money = BigDecimal.ZERO;
+            if(commissionType == 10){   //按金额
+                money = shopGood.getDeliveryMoney();
+            }else { //按比率
+                money = order.getPayPrice().multiply(shopGood.getDeliveryMoney()).divide(BigDecimal.valueOf(100), 3, RoundingMode.HALF_UP);
+            }
+            if(money.compareTo(BigDecimal.ZERO) > 0){
+                ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto();
+                reduceDto.setTypeEnum(ShopDealerTypeEnum.WITHDRAW_ACCOUNT);
+                reduceDto.setUserId(ticketOrder.getRiderId());
+                reduceDto.setOrderUserId(ticketOrder.getUserId());
+                if(Arrays.asList(1, 3).contains(order.getOrderType())){
+                    reduceDto.setOrderNo(order.getOrderNo());
+                }else {
+                    reduceDto.setOrderNo(ticketOrder.getNo());
+                }
+                reduceDto.setPrice(money);
+                reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.DELIVERY_REWARD);
+                shopDealerUserService.reduceBalance(reduceDto);
+            }
+        }
+
+        //4.配送费结算
+        if(Arrays.asList(1, 3).contains(order.getOrderType()) && order.getDeliveryFee().compareTo(BigDecimal.ZERO) > 0){
+            ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto();
+            reduceDto.setTypeEnum(ShopDealerTypeEnum.WITHDRAW_ACCOUNT);
+            reduceDto.setUserId(ticketOrder.getRiderId());
+            reduceDto.setOrderUserId(ticketOrder.getUserId());
+            reduceDto.setOrderNo(order.getOrderNo());
+            reduceDto.setPrice(order.getDeliveryFee());
+            reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.DELIVERY_FLOOR_FEE);
+            shopDealerUserService.reduceBalance(reduceDto);
+        }
+
+        //5.查询未完成订单，完成资金解冻
+        if(order != null && order.getOrderStatus() == 0){
+            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);
+        }
+
+        //5.调整订单为已完成、配送完成状态
+        order.setOrderStatus(1);
+        order.setDeliveryStatus(40);
+        order.setUpdateTime(now);
+        shopOrderService.updateById(order);
+    }
+
     private void settleRiderCommissionIfEligible(Integer ticketOrderId, Integer tenantId, boolean requirePhoto) {
         if (ticketOrderId == null || tenantId == null) {
             return;

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

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

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

@@ -486,6 +486,9 @@ public class DealerOrderSettlement10584Task {
 
 
         ShopDealerRefereeVO dealerRefereeVO = shopDealerRefereeMapper.getDealerIdByUserId(order.getUserId());
+        if(dealerRefereeVO == null){
+            return null;
+        }
         if (dealerLevel == 1) {
             Integer directUserId = dealerRefereeVO.getDirectUserId();
             Integer directUserType = dealerRefereeVO.getDirectUserType();

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

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

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

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

src/main/java/com/gxwebsoft/payment/constants/PaymentConstants.java

@@ -230,7 +230,7 @@ public class PaymentConstants {
      */
     public static class Environment {
         /** 开发环境 */
-        public static final String DEV = "dev";
+        public static final String DEV = "local";
         /** 测试环境 */
         public static final String TEST = "test";
         /** 生产环境 */

src/main/java/com/gxwebsoft/payment/service/WxPayConfigService.java

@@ -148,7 +148,7 @@ public class WxPayConfigService {
                 log.info("从数据库获取支付配置成功，租户ID: {}，将缓存配置", tenantId);
 
                 // 开发环境下，如果apiclientKey为空，设置默认值
-                if ("dev".equals(activeProfile) &&
+                if ("local".equals(activeProfile) &&
                     (payment.getApiclientKey() == null || payment.getApiclientKey().trim().isEmpty())) {
                     log.warn("开发环境：数据库配置中apiclientKey为空，使用默认值，租户ID: {}", tenantId);
                     payment.setApiclientKey("apiclient_key.pem");
@@ -167,7 +167,7 @@ public class WxPayConfigService {
         }
 
         // 数据库也没有配置
-        if (!"dev".equals(activeProfile)) {
+        if (!"local".equals(activeProfile)) {
             throw PaymentException.systemError("微信支付配置未找到，租户ID: " + tenantId + "，请检查数据库配置", null);
         }
 
@@ -180,7 +180,7 @@ public class WxPayConfigService {
      * 获取证书文件路径
      */
     private String getCertificatePath(Integer tenantId, Payment payment) throws PaymentException {
-        if ("dev".equals(activeProfile)) {
+        if ("local".equals(activeProfile)) {
             return getDevCertificatePath(tenantId);
         } else {
             return getProdCertificatePath(payment);
@@ -237,7 +237,7 @@ public class WxPayConfigService {
      */
     private Config createWxPayConfig(Payment payment, String certificatePath) throws PaymentException {
         try {
-            if ("dev".equals(activeProfile) && payment == null) {
+            if ("local".equals(activeProfile) && payment == null) {
                 // 开发环境测试配置
                 return createDevTestConfig(certificatePath);
             } else if (payment != null) {
@@ -343,7 +343,7 @@ public class WxPayConfigService {
         // 开发环境下，如果apiclientKey为空，给一个警告但不抛异常
         // 生产环境必须有apiclientKey
         if (payment.getApiclientKey() == null || payment.getApiclientKey().trim().isEmpty()) {
-            if ("dev".equals(activeProfile)) {
+            if ("local".equals(activeProfile)) {
                 log.warn("开发环境：证书文件名(apiclientKey)未配置，将使用默认值");
             } else {
                 throw PaymentException.systemError("证书文件名(apiclientKey)未配置", null);

src/main/java/com/gxwebsoft/shop/constants/WxPayConstants.java

@@ -78,7 +78,7 @@ public class WxPayConstants {
         public static final int AMOUNT_MULTIPLIER = 100;
         
         /** 开发环境标识 */
-        public static final String PROFILE_DEV = "dev";
+        public static final String PROFILE_DEV = "local";
         /** 生产环境标识 */
         public static final String PROFILE_PROD = "prod";
     }

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

@@ -6,9 +6,11 @@ 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.ShopDealerCapitalWaterDto;
 import com.gxwebsoft.shop.entity.ShopDealerCapital;
 import com.gxwebsoft.shop.param.ShopDealerCapitalParam;
 import com.gxwebsoft.shop.service.ShopDealerCapitalService;
+import com.gxwebsoft.shop.vo.ShopDealerCapitalWaterVO;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springdoc.api.annotations.ParameterObject;
@@ -39,6 +41,14 @@ public class ShopDealerCapitalController extends BaseController {
         return success(shopDealerCapitalService.pageRel(param));
     }
 
+    @PreAuthorize("hasAuthority('shop:shopDealerCapital:list')")
+    @Operation(summary = "分页查询分销商个人流水")
+    @GetMapping("/myCapitalWater")
+    public ApiResult<PageResult<ShopDealerCapitalWaterVO>> myCapitalWater(ShopDealerCapitalWaterDto waterDto) {
+        // 使用关联查询
+        return success(shopDealerCapitalService.myCapitalWater(waterDto));
+    }
+
     @PreAuthorize("hasAuthority('shop:shopDealerCapital:list')")
     @Operation(summary = "查询全部分销商资金明细表")
     @GetMapping()

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

@@ -3,19 +3,18 @@ package com.gxwebsoft.shop.controller;
 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.annotation.OperationLog;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.gxwebsoft.common.core.web.BaseController;
-import com.gxwebsoft.shop.service.ShopDealerOrderService;
-import com.gxwebsoft.shop.entity.ShopDealerOrder;
-import com.gxwebsoft.shop.param.ShopDealerOrderParam;
-import com.gxwebsoft.shop.param.ShopDealerOrderImportParam;
 import com.gxwebsoft.common.core.utils.JSONUtil;
 import com.gxwebsoft.common.core.web.ApiResult;
-import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.common.core.web.BaseController;
 import com.gxwebsoft.common.core.web.BatchParam;
-import com.gxwebsoft.common.core.annotation.OperationLog;
+import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.common.system.entity.User;
+import com.gxwebsoft.shop.entity.ShopDealerOrder;
+import com.gxwebsoft.shop.param.ShopDealerOrderImportParam;
+import com.gxwebsoft.shop.param.ShopDealerOrderParam;
+import com.gxwebsoft.shop.service.ShopDealerOrderService;
+import com.gxwebsoft.shop.task.OrderSettlementTask;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -24,6 +23,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -40,6 +40,9 @@ public class ShopDealerOrderController extends BaseController {
     @Resource
     private ShopDealerOrderService shopDealerOrderService;
 
+    @Resource
+    private OrderSettlementTask orderSettlementTask;
+
     @PreAuthorize("hasAuthority('shop:shopDealerOrder:list')")
     @Operation(summary = "分页查询分销商订单记录表")
     @GetMapping("/page")
@@ -64,6 +67,13 @@ public class ShopDealerOrderController extends BaseController {
         return success(shopDealerOrderService.getByIdRel(id));
     }
 
+    @PreAuthorize("hasAuthority('shop:shopDealerOrder:list')")
+    @Operation(summary = "查询个人今日收益")
+    @GetMapping("/todayRevenue")
+    public ApiResult<BigDecimal> todayRevenue() {
+        return success(shopDealerOrderService.todayRevenue());
+    }
+
     @PreAuthorize("hasAuthority('shop:shopDealerOrder:save')")
     @OperationLog
     @Operation(summary = "添加分销商订单记录表")
@@ -173,7 +183,7 @@ public class ShopDealerOrderController extends BaseController {
     @PreAuthorize("hasAuthority('shop:shopDealerOrder:update')")
     @OperationLog
     @Operation(summary = "手动触发单条订单佣金解冻")
-    @PostMapping("/unfreeze")
+//    @PostMapping("/unfreeze")
     public ApiResult<String> manualUnfreeze(@RequestBody Map<String, Object> body) {
         String orderNo = (String) body.get("orderNo");
         if (orderNo == null || orderNo.isBlank()) {
@@ -187,4 +197,11 @@ public class ShopDealerOrderController extends BaseController {
             return fail(e.getMessage(),null);
         }
     }
+
+    @Operation(summary = "店、服务商结算任务：每天一点，每10分钟执行一次结算任务")
+    @PutMapping("/teamSettlement")
+    public ApiResult<?> teamSettlement() {
+        orderSettlementTask.teamSettlement();
+        return success("success");
+    }
 }

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

@@ -79,6 +79,13 @@ public class ShopDealerUserController extends BaseController {
         return fail("添加失败");
     }
 
+    @PreAuthorize("hasAuthority('shop:shopDealerUser:update')")
+    @Operation(summary = "开启/关闭分销商用户核销权限")
+    @PutMapping("/verifyEnable")
+    public ApiResult<Boolean> verifyEnable(@RequestParam("id") Integer id) {
+        return success(shopDealerUserService.verifyEnable(id));
+    }
+
     @PreAuthorize("hasAuthority('shop:shopDealerUser:update')")
     @Operation(summary = "修改分销商用户记录表")
     @PutMapping()

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

@@ -43,9 +43,9 @@ public class ShopFlashSaleActivityController extends BaseController {
 
     @Operation(summary = "个人获取秒杀活动数据")
     @GetMapping("/getMyActive")
-    public ApiResult<List<ShopFlashSaleActivityVO>> getMyActive(@RequestParam("tenantId") Integer tenantId) {
+    public ApiResult<List<ShopFlashSaleActivityVO>> getMyActive(@RequestParam("tenantId") Integer tenantId, Integer popFlag) {
         // 使用关联查询
-        return success(shopFlashSaleActivityService.getMyActive(tenantId));
+        return success(shopFlashSaleActivityService.getMyActive(tenantId, popFlag));
     }
 
 //    @PreAuthorize("hasAuthority('shop:shopFlashSaleActivity:list')")
@@ -59,9 +59,9 @@ public class ShopFlashSaleActivityController extends BaseController {
 //    @PreAuthorize("hasAuthority('shop:shopFlashSaleActivity:list')")
     @Operation(summary = "根据id查询秒杀活动")
     @GetMapping("/{id}")
-    public ApiResult<ShopFlashSaleActivity> get(@PathVariable("id") Integer id) {
+    public ApiResult<ShopFlashSaleActivityVO> get(@PathVariable("id") Integer id) {
         // 使用关联查询
-        return success(shopFlashSaleActivityService.getByIdRel(id));
+        return success(shopFlashSaleActivityService.getInfoById(id));
     }
 
 //    @PreAuthorize("hasAuthority('shop:shopFlashSaleActivity:save')")

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

@@ -6,7 +6,6 @@ import com.gxwebsoft.shop.entity.ShopGoodsCategory;
 import com.gxwebsoft.shop.param.ShopGoodsCategoryParam;
 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;

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

@@ -0,0 +1,93 @@
+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.common.system.entity.User;
+import com.gxwebsoft.shop.entity.ShopGoodsProfit;
+import com.gxwebsoft.shop.param.ShopGoodsProfitParam;
+import com.gxwebsoft.shop.service.ShopGoodsProfitService;
+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;
+import java.util.List;
+
+/**
+ * 商品分润设定控制器
+ *
+ * @author xm
+ * @since 2026-05-20 14:33:00
+ */
+@Tag(name = "商品分润设定管理")
+@RestController
+@RequestMapping("/api/shop/shop-goods-profit")
+public class ShopGoodsProfitController extends BaseController {
+    @Resource
+    private ShopGoodsProfitService shopGoodsProfitService;
+
+//    @PreAuthorize("hasAuthority('shop:shopGoodsProfit:list')")
+    @Operation(summary = "分页查询商品分润设定")
+    @GetMapping("/page")
+    public ApiResult<PageResult<ShopGoodsProfit>> page(ShopGoodsProfitParam param) {
+        // 使用关联查询
+        return success(shopGoodsProfitService.pageRel(param));
+    }
+
+//    @PreAuthorize("hasAuthority('shop:shopGoodsProfit:list')")
+    @Operation(summary = "查询全部商品分润设定")
+    @GetMapping()
+    public ApiResult<List<ShopGoodsProfit>> list(ShopGoodsProfitParam param) {
+        // 使用关联查询
+        return success(shopGoodsProfitService.listRel(param));
+    }
+
+//    @PreAuthorize("hasAuthority('shop:shopGoodsProfit:list')")
+    @Operation(summary = "根据id查询商品分润设定")
+    @GetMapping("/{id}")
+    public ApiResult<ShopGoodsProfit> get(@PathVariable("id") Integer id) {
+        // 使用关联查询
+        return success(shopGoodsProfitService.getByIdRel(id));
+    }
+
+//    @PreAuthorize("hasAuthority('shop:shopGoodsProfit:save')")
+    @OperationLog
+    @Operation(summary = "添加商品分润设定")
+    @PostMapping()
+    public ApiResult<?> save(@RequestBody ShopGoodsProfit shopGoodsProfit) {
+        // 记录当前登录用户id
+        User loginUser = getLoginUser();
+        if (loginUser != null) {
+         shopGoodsProfit.setUserId(loginUser.getUserId());
+        }
+        if (shopGoodsProfitService.save(shopGoodsProfit)) {
+            return success("添加成功");
+        }
+        return fail("添加失败");
+    }
+
+//    @PreAuthorize("hasAuthority('shop:shopGoodsProfit:update')")
+    @OperationLog
+    @Operation(summary = "修改商品分润设定")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody ShopGoodsProfit shopGoodsProfit) {
+        if (shopGoodsProfitService.updateById(shopGoodsProfit)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+//    @PreAuthorize("hasAuthority('shop:shopGoodsProfit:remove')")
+    @OperationLog
+    @Operation(summary = "删除商品分润设定")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (shopGoodsProfitService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+}

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

@@ -20,6 +20,7 @@ import com.gxwebsoft.common.system.entity.User;
 import com.gxwebsoft.common.system.redis.OrderNoUtils;
 import com.gxwebsoft.glt.service.GltTicketIssueService;
 import com.gxwebsoft.glt.service.GltTicketRevokeService;
+import com.gxwebsoft.glt.task.DealerOrderSettlement10584Task;
 import com.gxwebsoft.payment.dto.PaymentResponse;
 import com.gxwebsoft.payment.enums.PaymentType;
 import com.gxwebsoft.payment.service.PaymentService;
@@ -31,6 +32,7 @@ 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.gxwebsoft.shop.vo.ShopOrderMyVerifyVO;
 import com.wechat.pay.java.core.RSAAutoCertificateConfig;
 import com.wechat.pay.java.core.notification.NotificationConfig;
 import com.wechat.pay.java.core.notification.NotificationParser;
@@ -41,6 +43,7 @@ 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.springdoc.api.annotations.ParameterObject;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.Authentication;
@@ -114,6 +117,8 @@ public class ShopOrderController extends BaseController {
     private GltTicketIssueService gltTicketIssueService;
     @Resource
     private OrderNoUtils orderNoUtils;
+    @Resource
+    private DealerOrderSettlement10584Task dealerOrderSettlement;
 
     @Operation(summary = "分页查询订单")
     @GetMapping("/page")
@@ -137,6 +142,13 @@ public class ShopOrderController extends BaseController {
         return success(shopOrderService.getByIdRel(id));
     }
 
+//    @PreAuthorize("hasAuthority('shop:shopOrder:list')")
+    @Operation(summary = "我已核销订单")
+    @GetMapping("/myVerifyOrder")
+    public ApiResult<ShopOrderMyVerifyVO> myVerifyOrder(@ParameterObject ShopOrderMyVerifyDto myVerifyDto) {
+        return success(shopOrderService.myVerifyOrder(myVerifyDto));
+    }
+
     @Operation(summary = "添加订单【单商品添加】")
     @PostMapping()
     public ApiResult<?> save(@RequestBody OrderCreateRequest request) {
@@ -805,7 +817,7 @@ public class ShopOrderController extends BaseController {
         if (config == null) {
             try {
                 NotificationConfig newConfig;
-                if (active.equals("dev")) {
+                if (active.equals("local")) {
                     // 开发环境 - 构建包含租户号的私钥路径
                     String tenantCertPath = "dev/wechat/" + tenantId;
                     String privateKeyPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getPrivateKeyFile();
@@ -975,6 +987,20 @@ public class ShopOrderController extends BaseController {
         return success(Boolean.TRUE);
     }
 
+    @Operation(summary = "支付成功发送水票", description = "支付成功发送水票")
+    @PutMapping("/suerTicketRelease")
+    public ApiResult<Boolean> suerTicketRelease(@RequestBody PaySuccessTaskDto taskDto){
+        gltTicketIssueService.suerTicketRelease(taskDto.getOrderNo(), taskDto.getTenantId());
+        return success(Boolean.TRUE);
+    }
+
+    @Operation(summary = "支付成功结算", description = "支付成功结算")
+    @PutMapping("/orderSettlement")
+    public ApiResult<Boolean> orderSettlement(@RequestBody PaySuccessTaskDto taskDto){
+        dealerOrderSettlement.orderSettlement(taskDto.getOrderNo());
+        return success(Boolean.TRUE);
+    }
+
     @Operation(summary = "更新订单支付状态", description = "用户支付成功后主动同步订单状态")
     @PutMapping("/payment-status")
     public ApiResult<?> updateOrderPaymentStatus(@RequestBody UpdatePaymentStatusRequest request) {

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

@@ -0,0 +1,103 @@
+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.ShopVerifyUser;
+import com.gxwebsoft.shop.param.ShopVerifyUserParam;
+import com.gxwebsoft.shop.service.ShopVerifyUserService;
+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;
+import java.util.List;
+
+/**
+ * 订单核销人管理控制器
+ *
+ * @author xm
+ * @since 2026-05-25 17:13:01
+ */
+@Tag(name = "订单核销人管理管理")
+@RestController
+@RequestMapping("/api/shop/shop-verify-user")
+public class ShopVerifyUserController extends BaseController {
+    @Resource
+    private ShopVerifyUserService shopVerifyUserService;
+
+//    @PreAuthorize("hasAuthority('shop:shopVerifyUser:list')")
+    @Operation(summary = "分页查询订单核销人管理")
+    @GetMapping("/page")
+    public ApiResult<PageResult<ShopVerifyUser>> page(ShopVerifyUserParam param) {
+        // 使用关联查询
+        return success(shopVerifyUserService.pageRel(param));
+    }
+
+//    @PreAuthorize("hasAuthority('shop:shopVerifyUser:list')")
+    @Operation(summary = "查询全部订单核销人管理")
+    @GetMapping()
+    public ApiResult<List<ShopVerifyUser>> list(ShopVerifyUserParam param) {
+        // 使用关联查询
+        return success(shopVerifyUserService.listRel(param));
+    }
+
+//    @PreAuthorize("hasAuthority('shop:shopVerifyUser:list')")
+    @Operation(summary = "根据id查询订单核销人管理")
+    @GetMapping("/{id}")
+    public ApiResult<ShopVerifyUser> get(@PathVariable("id") Integer id) {
+        // 使用关联查询
+        return success(shopVerifyUserService.getByIdRel(id));
+    }
+
+//    @PreAuthorize("hasAuthority('shop:shopVerifyUser:list')")
+    @Operation(summary = "根据用户ID查询订单核销人管理")
+    @GetMapping("/getByUserId")
+    public ApiResult<ShopVerifyUser> getByUserId(@RequestParam("userId") Integer userId) {
+        return success(shopVerifyUserService.getInfo(userId));
+    }
+
+//    @PreAuthorize("hasAuthority('shop:shopVerifyUser:save')")
+    @OperationLog
+    @Operation(summary = "添加订单核销人管理")
+    @PostMapping()
+    public ApiResult<Boolean> save(@RequestBody ShopVerifyUser shopVerifyUser) {
+        return success(shopVerifyUserService.saveInfo(shopVerifyUser));
+    }
+
+//    @PreAuthorize("hasAuthority('shop:shopVerifyUser:update')")
+    @Operation(summary = "修改订单核销人管理")
+    @PutMapping()
+    public ApiResult<?> update(@RequestBody ShopVerifyUser shopVerifyUser) {
+        if (shopVerifyUserService.updateById(shopVerifyUser)) {
+            return success("修改成功");
+        }
+        return fail("修改失败");
+    }
+
+    @Operation(summary = "修改订单核销人开启状态")
+    @PutMapping("/updateStatus")
+    public ApiResult<Boolean> updateStatus(@RequestParam("id") Integer id) {
+        return success(shopVerifyUserService.updateStatus(id));
+    }
+
+    @Operation(summary = "修改订单核销人核销权限")
+    @PutMapping("/updateVerifyFlag")
+    public ApiResult<Boolean> updateVerifyFlag(@RequestParam("id") Integer id) {
+        return success(shopVerifyUserService.updateVerifyFlag(id));
+    }
+
+//    @PreAuthorize("hasAuthority('shop:shopVerifyUser:remove')")
+    @OperationLog
+    @Operation(summary = "删除订单核销人管理")
+    @DeleteMapping("/{id}")
+    public ApiResult<?> remove(@PathVariable("id") Integer id) {
+        if (shopVerifyUserService.removeById(id)) {
+            return success("删除成功");
+        }
+        return fail("删除失败");
+    }
+
+
+}

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

@@ -91,6 +91,12 @@ public class OrderCreateRequest {
     @Schema(description = "发货店铺")
     private String expressMerchantName;
 
+    @Schema(description = "配送方式 0-电梯 1-步梯")
+    private Integer deliveryMethod;
+
+    @Schema(description = "楼层")
+    private Integer deliveryFloor;
+
     @Schema(description = "订单总额")
     @NotNull(message = "订单总额不能为空")
     @DecimalMin(value = "0.01", message = "订单总额必须大于0")

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

@@ -0,0 +1,28 @@
+package com.gxwebsoft.shop.dto;
+
+import com.gxwebsoft.common.core.web.BaseParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+
+/**
+ * 查询个人流水
+ *
+ */
+@Data
+@Schema(name = "ShopDealerCapitalWaterDto", description = "查询个人流水")
+public class ShopDealerCapitalWaterDto extends BaseParam {
+
+    @Schema(description = "用户ID")
+    @NotEmpty(message = "用户ID不能为空！")
+    private Integer userId;
+
+    @Schema(description = "起始时间", example = "2026-05-01")
+    private String dateStart;
+
+    @Schema(description = "结束时间", example = "2026-05-31")
+    private String dateEnd;
+
+}
+

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

@@ -0,0 +1,31 @@
+package com.gxwebsoft.shop.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 分销订单结算
+ * @author xm
+ * @since 2026-05-13
+ */
+@Data
+@Schema(name = "ShopDealerSettlementDto", description = "分销订单结算")
+public class ShopDealerSettlementDto {
+
+    @Schema(description = "变动类型 1-操作冻结账户余额 2-操作提现账户余额【直接结算】 3-解冻 4-退款")
+    private Integer type;
+
+    @Schema(description = "资金流动类型 (10分销收入 11团队管理津贴收入 12分红收入 13现场推广收入 20提现支出 30转账支出 40转账收入 50佣金解冻 60配送奖励 70佣金退回【退单】)")
+    private Integer flowType;
+
+    @Schema(description = "描述")
+    private String comments;
+
+    @Schema(description = "商城ID")
+    private Integer tenantId;
+
+    @Schema(description = "明细列表")
+    private List<ShopDealerSettlementItemDto> itemList;
+}

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

@@ -0,0 +1,26 @@
+package com.gxwebsoft.shop.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 分销订单退款
+ * @author xm
+ * @since 2026-05-13
+ */
+@Data
+@Schema(name = "ShopDealerSettlementItemDto", description = "分销订单退款")
+public class ShopDealerSettlementItemDto {
+
+    @Schema(description = "订单号")
+    private String no;
+
+    @Schema(description = "分销商用户ID")
+    private Integer userId;
+
+    @Schema(description = "变更金额")
+    private BigDecimal money;
+
+}

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

@@ -0,0 +1,27 @@
+package com.gxwebsoft.shop.dto;
+
+import com.gxwebsoft.common.core.web.BaseParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 查询个人核销记录
+ *
+ */
+@Data
+@Schema(name = "ShopOrderMyVerifyDto", description = "查询个人核销记录")
+public class ShopOrderMyVerifyDto extends BaseParam {
+
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    @Schema(description = "开始时间【核销时间】", example = "2026-05-20")
+    private String dateStart;
+
+    @Schema(description = "结束时间【核销时间】", example = "2026-05-25")
+    private String dateEnd;
+}
+

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

@@ -26,7 +26,7 @@ public class UserOrderStats implements Serializable {
     @Schema(description = "待核销（statusFilter=2）")
     private Long waitVerify;
 
-    @Schema(description = "待收货（statusFilter=3）")
+    @Schema(description = "待收货/使用（statusFilter=3）")
     private Long waitReceive;
 
     @Schema(description = "待评价（statusFilter=4）")

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

@@ -38,6 +38,9 @@ public class ShopActiveImage implements Serializable {
     @Schema(description = "图片地址，多个以‘,’隔开")
     private String imgUrl;
 
+    @Schema(description = "分享底图")
+    private String shareImg;
+
     @Schema(description = "图片地址集合")
     @TableField(exist = false)
     private List<String> imgUrlList;
@@ -48,6 +51,13 @@ public class ShopActiveImage implements Serializable {
     @Schema(description = "排序")
     private Integer sortNumber;
 
+    @Schema(description = "跳转商品ID")
+    private Integer goodsId;
+
+    @Schema(description = "跳转商品名称")
+    @TableField(exist = false)
+    private String goodsName;
+
     @Schema(description = "租户ID")
     @NotNull(message = "租户ID不能为空！")
     private Integer tenantId;

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

@@ -49,7 +49,7 @@ public class ShopDealerCapital implements Serializable {
     @TableField(exist = false)
     private Integer orderStatus;
 
-    @Schema(description = "资金流动类型 (10分销收入 11团队管理津贴收入 12分红收入 13现场推广收入 20提现支出 30转账支出 40转账收入 50佣金解冻 60配送奖励 70佣金退回【退单】)")
+    @Schema(description = "资金流动类型 (10分销收入 11团队管理津贴收入 12分红收入 13现场推广收入 14现场推广分佣 20提现支出 30转账支出 40转账收入 50佣金解冻 60配送奖励 61配送提成 62配送步梯费 70佣金退回【退单】)")
     private Integer flowType;
 
     @Schema(description = "变更金额")
@@ -77,6 +77,9 @@ public class ShopDealerCapital implements Serializable {
     @Schema(description = "结算月份")
     private String month;
 
+    @Schema(description = "结算标识 0-未结算 1-已结算")
+    private Integer paymentFlag;
+
     @Schema(description = "商城ID")
     private Integer tenantId;
 

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

@@ -1,12 +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.*;
-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;
@@ -105,6 +104,9 @@ public class ShopDealerUser implements Serializable {
     @Schema(description = "排序号")
     private Integer sortNumber;
 
+    @Schema(description = "核销权限是否开启 0-未开启 1-已开启")
+    private Boolean verifyFlag;
+
     @Schema(description = "是否删除")
     private Integer isDelete;
 
@@ -115,6 +117,9 @@ public class ShopDealerUser implements Serializable {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
+    @Schema(description = "更新人")
+    private Integer updater;
+
     @Schema(description = "修改时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;
@@ -122,4 +127,8 @@ public class ShopDealerUser implements Serializable {
     @Schema(description = "分销商等级：0-普通用户 1-超级管理员 2-合伙人(总店) 3-合伙人(分店)")
     private Integer dealerLevel;
 
+    @Schema(description = "删除 0-未删 1-已删")
+    @TableLogic
+    private Integer deleted;
+
 }

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

@@ -78,6 +78,9 @@ public class ShopFlashSaleActivity implements Serializable {
     @Schema(description = "排序")
     private Integer sortNumber;
 
+    @Schema(description = "是否弹窗 0-否 1-是")
+    private Integer popFlag;
+
     @Schema(description = "租户id")
     private Integer tenantId;
 

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

@@ -1,15 +1,16 @@
 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.*;
-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;
+import java.util.List;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -110,6 +111,12 @@ public class ShopGoods implements Serializable {
     @Schema(description = "推广核验佣金比率")
     private BigDecimal verifyRate;
 
+    @Schema(description = "推广核验上级/指定人")
+    private Integer verifyParentUserId;
+
+    @Schema(description = "推广核验上级佣金比率/指定分佣")
+    private BigDecimal verifyParentRate;
+
     @Schema(description = "库存计算方式(10下单减库存 20付款减库存)")
     @JsonAlias({"cdeductStockType"})
     private Integer deductStockType;
@@ -174,24 +181,44 @@ public class ShopGoods implements Serializable {
     @Schema(description = "用户ID")
     private Integer userId;
 
-    @Schema(description = "租户id")
+    @Schema(description = "配送方式:1-自配送 2-自提 4-发快递 5-水票 多属性用','隔开")
-    private Integer tenantId;
-
-    @Schema(description = "配送方式:1-自配送 2-自提 4-发快递 多属性用','隔开")
     private String deliveryType;
 
+    @Schema(description = "配送方式:1-自配送 2-自提 4-发快递 5-水票 多属性用','隔开")
+    @TableField(exist = false)
+    private List<Integer> deliveryTypeList;
+
     @Schema(description = "水票标识 0-否 1-是")
     private Integer waterTicketFlag;
 
     @Schema(description = "水票ID")
     private Integer waterTickerId;
 
+    @Schema(description = "0-按每桶楼层计算 1-固定金额")
+    private Integer deliveryFeeType;
+
+    @Schema(description = "配送楼层步梯费（元）")
+    private BigDecimal deliveryFee;
+
+    @Schema(description = "租户id")
+    private Integer tenantId;
+
+    @Schema(description = "创建人")
+    private Integer creator;
+
     @Schema(description = "创建时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
+    @Schema(description = "修改人")
+    private Integer updater;
+
     @Schema(description = "修改时间")
     @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/ShopGoodsCategory.java

@@ -2,15 +2,16 @@ package com.gxwebsoft.shop.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import com.fasterxml.jackson.annotation.JsonFormat;
 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 com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * 商品分类
  *
@@ -20,6 +21,7 @@ import lombok.EqualsAndHashCode;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Schema(name = "ShopGoodsCategory对象", description = "商品分类")
+@TableName("shop_goods_category")
 public class ShopGoodsCategory implements Serializable {
     private static final long serialVersionUID = 1L;
 

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

@@ -0,0 +1,65 @@
+package com.gxwebsoft.shop.entity;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableId;
+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-05-20 14:33:00
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(name = "ShopGoodsProfit对象", description = "商品分润设定")
+@TableName("shop_goods_profit")
+public class ShopGoodsProfit implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @Schema(description = "类型 1-股东分红 2-其他")
+    private Integer type;
+
+    @Schema(description = "商品ID")
+    private Integer goodsId;
+
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+    @Schema(description = "分佣比例 百分比")
+    private BigDecimal profit;
+
+    @Schema(description = "开启状态 0-未开启 1-开启")
+    private Integer status;
+
+    @Schema(description = "租户ID")
+    private Integer tenantId;
+
+    @Schema(description = "创建人")
+    private Integer creator;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "更新人")
+    private Integer updater;
+
+    @Schema(description = "更新人")
+    private LocalDateTime updateTime;
+
+    @Schema(description = "删除 0-未删 1-已删")
+    @TableLogic
+    private Integer deleted;
+
+}

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

@@ -33,7 +33,7 @@ public class ShopOrder implements Serializable {
     @TableId(value = "order_id", type = IdType.AUTO)
     private Integer orderId;
 
-    @Schema(description = "订单类型 1-及时自配送 2-自提 3-预约自配送 4-发快递")
+    @Schema(description = "订单类型 1-及时自配送 2-自提 3-预约自配送 4-发快递 5-水票 6-(配送：自配送/快递)")
     private Integer orderType;
 
     @Schema(description = "订单编号")
@@ -190,7 +190,7 @@ public class ShopOrder implements Serializable {
     @Schema(description = "0未使用，1已完成，2已取消，3取消中，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款")
     private Integer orderStatus;
 
-    @Schema(description = "发货状态(10未发货 20已发货 30部分发货)")
+    @Schema(description = "发货状态(10未发货 20已发货 30部分发货 40已送达)")
     private Integer deliveryStatus;
 
     @Schema(description = "发货备注")
@@ -313,6 +313,10 @@ public class ShopOrder implements Serializable {
     @Schema(description = "秒杀活动ID")
     private Integer activityId;
 
+    @Schema(description = "秒杀活动ID")
+    @TableField(exist = false)
+    private String activityName;
+
     @Schema(description = "水票订单标识 0-否 1-是")
     private Integer waterTicketFlag;
 
@@ -331,9 +335,34 @@ public class ShopOrder implements Serializable {
     @Schema(description = "核销人")
     private Integer verifyUser;
 
+    @Schema(description = "核销人")
+    @TableField(exist = false)
+    private String verifyUserName;
+
     @Schema(description = "推广核销佣金")
     private BigDecimal verifyMoney;
 
+    @Schema(description = "推广核验上级/指定人")
+    private Integer verifyParentUser;
+
+    @Schema(description = "推广核验上级/指定人佣金")
+    private BigDecimal verifyParentMoney;
+
+    @Schema(description = "门店、服务商结算标识 0-未结算 1-已结算")
+    private Integer teamSettlementFlag;
+
+    @Schema(description = "分红结算标识 0-未结算 1-已结算")
+    private Integer dividendSettlementFlag;
+
+    @Schema(description = "配送方式 0-电梯 1-步梯")
+    private Integer deliveryMethod;
+
+    @Schema(description = "楼层")
+    private Integer deliveryFloor;
+
+    @Schema(description = "配送费(步梯配送特有)")
+    private BigDecimal deliveryFee;
+
     @Schema(description = "修改时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime updateTime;

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

@@ -54,6 +54,14 @@ public class ShopOrderGoods implements Serializable {
     @Schema(description = "商品名称")
     private String goodsName;
 
+    @Schema(description = "商品名称")
+    @TableField(exist = false)
+    private String activeNam;
+
+    @Schema(description = "核销码")
+    @TableField(exist = false)
+    private String verifyCode;
+
     @Schema(description = "商品规格")
     private String spec;
 

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

@@ -32,6 +32,9 @@ public class ShopSurchargeConfig implements Serializable {
     @Schema(description = "名称")
     private String name;
 
+    @Schema(description = "商品ID")
+    private Integer goodsId;
+
     @Schema(description = "价格（元）")
     private BigDecimal price;
 

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

@@ -0,0 +1,61 @@
+package com.gxwebsoft.shop.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.time.LocalDateTime;
+import java.io.Serializable;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 订单核销人管理
+ *
+ * @author xm
+ * @since 2026-05-25 17:13:00
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Schema(name = "ShopVerifyUser对象", description = "订单核销人管理")
+@TableName("shop_verify_user")
+public class ShopVerifyUser implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "主键ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    @Schema(description = "用户ID")
+    private Integer userId;
+
+    @Schema(description = "用户名称")
+    @TableField(exist = false)
+    private String userName;
+
+    @Schema(description = "核销权限是否开启 0-未开启 1-已开启")
+    private Integer verifyFlag;
+
+    @Schema(description = "是否开启 0-未开始 1-已开启")
+    private Integer status;
+
+    @Schema(description = "排序号")
+    private Integer sortNumber;
+
+    @Schema(description = "创建人")
+    private Integer creator;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "更新人")
+    private Integer updater;
+
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+    @Schema(description = "是否删除 0-未删 1-已删")
+    @TableLogic
+    private Integer deleted;
+
+}

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

@@ -2,8 +2,11 @@ package com.gxwebsoft.shop.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gxwebsoft.shop.dto.ShopDealerCapitalWaterDto;
 import com.gxwebsoft.shop.entity.ShopDealerCapital;
 import com.gxwebsoft.shop.param.ShopDealerCapitalParam;
+import com.gxwebsoft.shop.vo.ShopDealerCapitalWaterVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -34,4 +37,12 @@ public interface ShopDealerCapitalMapper extends BaseMapper<ShopDealerCapital> {
      */
     List<ShopDealerCapital> selectListRel(@Param("param") ShopDealerCapitalParam param);
 
+    /**
+     * 查询个人资金流水
+     * @param page
+     * @param entity
+     * @return
+     */
+    IPage<ShopDealerCapitalWaterVO> getPageInfo(@Param("page") Page page, @Param("entity") ShopDealerCapitalWaterDto entity);
+
 }

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.gxwebsoft.shop.entity.ShopDealerOrder;
 import com.gxwebsoft.shop.param.ShopDealerOrderParam;
+import com.gxwebsoft.shop.vo.ShopDealerOrderTaskVO;
+import com.gxwebsoft.shop.vo.ShopDealerOrderTodayRevenueVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -34,4 +36,18 @@ public interface ShopDealerOrderMapper extends BaseMapper<ShopDealerOrder> {
      */
     List<ShopDealerOrder> selectListRel(@Param("param") ShopDealerOrderParam param);
 
+    /**
+     * 获取订单门店/分销商待结算数据
+     * @param tenantId  租户ID
+     * @return
+     */
+    List<ShopDealerOrderTaskVO> getDealerOrderList(@Param("tenantId") Integer tenantId);
+
+    /**
+     * 获取用户当日分佣数据
+     * @param userId
+     * @return
+     */
+    List<ShopDealerOrderTodayRevenueVO> getTodayRevenue(@Param("userId") Integer userId);
+
 }

src/main/java/com/gxwebsoft/shop/mapper/ShopGoodsProfitMapper.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.ShopGoodsProfit;
+import com.gxwebsoft.shop.param.ShopGoodsProfitParam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 商品分润设定Mapper
+ *
+ * @author xm
+ * @since 2026-05-20 14:33:00
+ */
+public interface ShopGoodsProfitMapper extends BaseMapper<ShopGoodsProfit> {
+
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param param 查询参数
+     * @return List<ShopGoodsProfit>
+     */
+    List<ShopGoodsProfit> selectPageRel(@Param("page") IPage<ShopGoodsProfit> page,
+                             @Param("param") ShopGoodsProfitParam param);
+
+    /**
+     * 查询全部
+     *
+     * @param param 查询参数
+     * @return List<User>
+     */
+    List<ShopGoodsProfit> selectListRel(@Param("param") ShopGoodsProfitParam param);
+
+}

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

@@ -3,9 +3,13 @@ package com.gxwebsoft.shop.mapper;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.gxwebsoft.shop.dto.ShopOrderMyVerifyDto;
 import com.gxwebsoft.shop.entity.ShopOrder;
 import com.gxwebsoft.shop.param.ShopOrderParam;
+import com.gxwebsoft.shop.vo.ShopOrderGoodsInfoVO;
 import com.gxwebsoft.shop.vo.ShopOrderGoodsVO;
+import com.gxwebsoft.shop.vo.ShopOrderMyVerifyItemVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
@@ -67,4 +71,20 @@ public interface ShopOrderMapper extends BaseMapper<ShopOrder> {
      * @return
      */
     List<ShopOrderGoodsVO> getOrderGoodsInfo(@Param("orderNo") String orderNo);
+
+    /**
+     * 查询我的核销订单数据
+     * @param page
+     * @param entity
+     * @return
+     */
+    IPage<ShopOrderMyVerifyItemVO> getMyVerifyPageInfo(@Param("page") Page page, @Param("entity") ShopOrderMyVerifyDto entity);
+
+    /**
+     * 通过订单号查询订单商品名称
+     * @param orderNoList
+     * @return
+     */
+    List<ShopOrderGoodsInfoVO> getOrderGoodsInfoByOrderNos(@Param("orderNoList") List<String> orderNoList);
+
 }

src/main/java/com/gxwebsoft/shop/mapper/ShopVerifyUserMapper.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.ShopVerifyUser;
+import com.gxwebsoft.shop.param.ShopVerifyUserParam;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 订单核销人管理Mapper
+ *
+ * @author xm
+ * @since 2026-05-25 17:13:00
+ */
+public interface ShopVerifyUserMapper extends BaseMapper<ShopVerifyUser> {
+
+    /**
+     * 分页查询
+     *
+     * @param page  分页对象
+     * @param param 查询参数
+     * @return List<ShopVerifyUser>
+     */
+    List<ShopVerifyUser> selectPageRel(@Param("page") IPage<ShopVerifyUser> page,
+                             @Param("param") ShopVerifyUserParam param);
+
+    /**
+     * 查询全部
+     *
+     * @param param 查询参数
+     * @return List<User>
+     */
+    List<ShopVerifyUser> selectListRel(@Param("param") ShopVerifyUserParam param);
+
+}

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

@@ -55,5 +55,23 @@
     <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.ShopDealerCapital">
         <include refid="selectSql"></include>
     </select>
+    <select id="getPageInfo" resultType="com.gxwebsoft.shop.vo.ShopDealerCapitalWaterVO">
+        SELECT
+            no,
+            order_no,
+            flow_type,
+            money,
+            freeze_money,
+            comments,
+            create_time
+        FROM
+            shop_dealer_capital
+        WHERE
+            user_id = #{entity.userId}
+        <if test="entity.dateStart != null and entity.dateEnd != null">
+            AND DATE(create_time) BETWEEN #{entity.dateStart} AND #{entity.dateEnd}
+        </if>
+        ORDER BY create_time DESC
+    </select>
 
 </mapper>

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

@@ -89,5 +89,46 @@
     <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.ShopDealerOrder">
         <include refid="selectSql"></include>
     </select>
+    <select id="getDealerOrderList" resultType="com.gxwebsoft.shop.vo.ShopDealerOrderTaskVO">
+        SELECT
+            a.order_id,
+            b.id as shopDealerOrderId,
+            b.order_no,
+            first_dividend_user,
+            b.first_dividend,
+            b.first_dividend_flag,
+            second_dividend_user,
+            b.second_dividend,
+            b.second_dividend_flag
+        FROM
+            shop_order a
+                LEFT JOIN shop_dealer_order b ON a.order_no = b.order_no
+        WHERE
+            DATE(a.create_time) >= '2026-05-14'
+            AND a.team_settlement_flag = 0
+            AND a.pay_status = 1
+            AND a.order_status = 1
+            AND a.deleted = 0
+            AND ((b.first_dividend > 0 AND first_dividend_flag = 0) OR (b.second_dividend > 0 AND second_dividend_flag = 0))
+    </select>
+    <select id="getTodayRevenue" resultType="com.gxwebsoft.shop.vo.ShopDealerOrderTodayRevenueVO">
+        SELECT
+            a.order_no,
+            b.order_status,
+            a.first_user_id,
+            a.first_money,
+            a.second_user_id,
+            a.second_money,
+            a.first_dividend_user,
+            a.first_dividend,
+            a.second_dividend_user,
+            a.second_dividend
+        FROM
+            shop_dealer_order a
+                LEFT JOIN shop_order b ON a.order_no = b.order_no
+        WHERE
+            DATE(a.create_time) = CURRENT_DATE
+            AND (a.first_user_id = #{userId} OR a.second_user_id = #{userId} OR a.first_dividend_user = #{userId} OR a.second_dividend_user = #{userId})
+    </select>
 
 </mapper>

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

@@ -110,6 +110,9 @@
             <if test="param.deleted != null">
                 AND a.deleted = #{param.deleted}
             </if>
+            <if test="param.waterTicketFlag != null">
+                AND a.water_ticket_flag = #{param.waterTicketFlag}
+            </if>
             <if test="param.deleted == null">
                 AND a.deleted = 0
             </if>

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

@@ -0,0 +1,63 @@
+<?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.ShopGoodsProfitMapper">
+
+    <!-- 关联查询sql -->
+    <sql id="selectSql">
+        SELECT a.*
+        FROM shop_goods_profit a
+        <where>
+            <if test="param.id != null">
+                AND a.id = #{param.id}
+            </if>
+            <if test="param.type != null">
+                AND a.type = #{param.type}
+            </if>
+            <if test="param.goodsId != null">
+                AND a.goods_id = #{param.goodsId}
+            </if>
+            <if test="param.userId != null">
+                AND a.user_id = #{param.userId}
+            </if>
+            <if test="param.profit != null">
+                AND a.profit = #{param.profit}
+            </if>
+            <if test="param.status != null">
+                AND a.status = #{param.status}
+            </if>
+            <if test="param.creator != null">
+                AND a.creator = #{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 = #{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.ShopGoodsProfit">
+        <include refid="selectSql"></include>
+    </select>
+
+    <!-- 查询全部 -->
+    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.ShopGoodsProfit">
+        <include refid="selectSql"></include>
+    </select>
+
+</mapper>

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

@@ -241,15 +241,15 @@
               </if>
               <if test="param.statusFilter == 1">
                 <!-- 1待发货：已付款但未发货 -->
-                AND a.pay_status = 1 AND a.delivery_status = 10 AND a.order_status = 0 AND a.order_type in(1, 3, 4)
+                AND a.pay_status = 1 AND a.delivery_status = 10 AND a.order_status = 0 AND a.order_type in(1, 3, 4, 5)
               </if>
               <if test="param.statusFilter == 2">
                 <!-- 2待核销：已付款但订单状态为未使用 -->
                 AND a.pay_status = 1 AND a.order_status = 0 and order_type = 2
               </if>
               <if test="param.statusFilter == 3">
-                <!-- 3待收货：已发货但订单状态不是已完成 -->
+                <!-- 3待收货/使用：已发货但订单状态不是已完成 -->
-                AND a.pay_status = 1 AND a.delivery_status = 20 AND a.order_status = 0
+                AND a.pay_status = 1 AND a.order_status = 0 AND (a.delivery_status = 20 or (a.order_type = 2 and a.delivery_status = 10))
               </if>
               <if test="param.statusFilter == 4">
                 <!-- 4待评价：订单已完成但可能需要评价 -->
@@ -298,12 +298,12 @@
           -- “全部”默认也会过滤已关闭(取消)订单：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.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 in(1, 3, 4, 5) 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 = 0 AND (a.delivery_status = 20 or (a.order_type = 2 and a.delivery_status = 10)) 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 = 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 = 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
@@ -342,8 +342,57 @@
           AND c.is_open_commission = 1
           AND a.order_no = #{orderNo}
     </select>
-
+    <select id="getMyVerifyPageInfo" resultType="com.gxwebsoft.shop.vo.ShopOrderMyVerifyItemVO">
-  <!-- 根据订单号修改订单 -->
+        SELECT
+            a.order_id,
+            a.order_type,
+            a.order_no,
+            a.total_price,
+            a.pay_price,
+            a.total_num,
+            b.goods_name,
+            c.NAME as activeName,
+            a.pay_type,
+            a.pay_status,
+            a.order_status,
+            a.user_id,
+            a.verify_time,
+            a.verify_user,
+            a.verify_money,
+            a.create_time
+        FROM
+            shop_order a
+                LEFT JOIN shop_order_goods b ON a.order_id = b.order_id
+                LEFT JOIN shop_flash_sale_activity c ON a.activity_id = c.id
+        WHERE
+            a.verify_user = #{entity.userId}
+          AND a.deleted = 0
+          <if test="entity.orderNo != null and entity.order != ''">
+              AND a.order_no LIKE CONCAT('%', #{entity.orderNo}, '%')
+          </if>
+          <if test="entity.dateStart != null and entity.dateStart != '' and entity.dateEnd != null and entity.dateEnd !=''">
+              AND DATE(a.verify_time) BETWEEN #{entity.dateStart} AND #{entity.dateEnd}
+          </if>
+          ORDER BY a.create_time desc
+    </select>
+    <select id="getOrderGoodsInfoByOrderNos" resultType="com.gxwebsoft.shop.vo.ShopOrderGoodsInfoVO">
+        SELECT
+            a.order_no,
+            b.order_status,
+            c.goods_name
+        FROM
+            glt_ticket_order a
+                LEFT JOIN shop_order b ON a.order_no = b.order_no
+                LEFT JOIN shop_order_goods c ON b.order_id = c.order_id
+        WHERE
+            a.deleted = 0
+          AND b.deleted = 0
+          AND a.order_no in
+        <foreach collection="orderNoList" index="index" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+    </select>
+    <!-- 根据订单号修改订单 -->
   <update id="updateByOutTradeNo" parameterType="com.gxwebsoft.cms.entity.CmsWebsite">
     UPDATE shop_order
     <set>

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

@@ -0,0 +1,57 @@
+<?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.ShopVerifyUserMapper">
+
+    <!-- 关联查询sql -->
+    <sql id="selectSql">
+        SELECT a.*
+        FROM shop_verify_user a
+        <where>
+            <if test="param.id != null">
+                AND a.id = #{param.id}
+            </if>
+            <if test="param.userId != null">
+                AND a.user_id = #{param.userId}
+            </if>
+            <if test="param.verifyFlag != null">
+                AND a.verify_flag = #{param.verifyFlag}
+            </if>
+            <if test="param.status != null">
+                AND a.status = #{param.status}
+            </if>
+            <if test="param.creator != null">
+                AND a.creator = #{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 = #{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.ShopVerifyUser">
+        <include refid="selectSql"></include>
+    </select>
+
+    <!-- 查询全部 -->
+    <select id="selectListRel" resultType="com.gxwebsoft.shop.entity.ShopVerifyUser">
+        <include refid="selectSql"></include>
+    </select>
+
+</mapper>

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

@@ -35,6 +35,9 @@ public class ShopActiveImageParam extends BaseParam {
     @Schema(description = "图片地址")
     private String imgUrl;
 
+    @Schema(description = "分享底图")
+    private String shareImg;
+
     @Schema(description = "启用状态 0-启用 1-禁用")
     @QueryField(type = QueryType.EQ)
     private Integer status;

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

@@ -69,6 +69,9 @@ public class ShopFlashSaleActivityParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer sortNumber;
 
+    @Schema(description = "是否弹窗 0-否 1-是")
+    private Integer popFlag;
+
     @Schema(description = "创建者")
     private String creator;
 

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

@@ -1,15 +1,17 @@
 package com.gxwebsoft.shop.param;
 
-import java.math.BigDecimal;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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;
+import java.time.LocalDateTime;
+
 /**
  * 商品查询参数
  *
@@ -158,4 +160,33 @@ public class ShopGoodsParam extends BaseParam {
     @QueryField(type = QueryType.EQ)
     private Integer deliveryMode;
 
+    @Schema(description = "配送方式:1-自配送 2-自提 4-发快递 多属性用','隔开")
+    private String deliveryType;
+
+    @Schema(description = "水票标识 0-否 1-是")
+    private Integer waterTicketFlag;
+
+    @Schema(description = "水票ID")
+    private Integer waterTickerId;
+
+    @Schema(description = "0-按每桶楼层计算 1-固定金额")
+    private Integer deliveryFeeType;
+
+    @Schema(description = "租户id")
+    private Integer tenantId;
+
+    @Schema(description = "创建人")
+    private Integer creator;
+
+    @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    @Schema(description = "修改人")
+    private Integer updater;
+
+    @Schema(description = "修改时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
 }

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

@@ -0,0 +1,61 @@
+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-05-20 14:33:00
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Schema(name = "ShopGoodsProfitParam对象", description = "商品分润设定查询参数")
+public class ShopGoodsProfitParam extends BaseParam {
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "主键ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer id;
+
+    @Schema(description = "类型 1-股东分红 2-其他")
+    @QueryField(type = QueryType.EQ)
+    private Integer type;
+
+    @Schema(description = "商品ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer goodsId;
+
+    @Schema(description = "用户ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer userId;
+
+    @Schema(description = "分佣比例 百分比")
+    @QueryField(type = QueryType.EQ)
+    private BigDecimal profit;
+
+    @Schema(description = "开启状态 0-未开启 1-开启")
+    @QueryField(type = QueryType.EQ)
+    private Integer status;
+
+    @Schema(description = "创建人")
+    @QueryField(type = QueryType.EQ)
+    private Integer creator;
+
+    @Schema(description = "更新人")
+    @QueryField(type = QueryType.EQ)
+    private Integer updater;
+
+    @Schema(description = "删除 0-未删 1-已删")
+    @QueryField(type = QueryType.EQ)
+    private Integer deleted;
+
+}

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

@@ -0,0 +1,52 @@
+package com.gxwebsoft.shop.param;
+
+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 io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 订单核销人管理查询参数
+ *
+ * @author xm
+ * @since 2026-05-25 17:13:00
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@Schema(name = "ShopVerifyUserParam对象", description = "订单核销人管理查询参数")
+public class ShopVerifyUserParam extends BaseParam {
+    private static final long serialVersionUID = 1L;
+
+    @Schema(description = "主键ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer id;
+
+    @Schema(description = "用户ID")
+    @QueryField(type = QueryType.EQ)
+    private Integer userId;
+
+    @Schema(description = "核销权限是否开启 0-未开启 1-已开启")
+    @QueryField(type = QueryType.EQ)
+    private Integer verifyFlag;
+
+    @Schema(description = "是否开启 0-未开始 1-已开启")
+    @QueryField(type = QueryType.EQ)
+    private Integer status;
+
+    @Schema(description = "创建人")
+    @QueryField(type = QueryType.EQ)
+    private Integer creator;
+
+    @Schema(description = "更新人")
+    @QueryField(type = QueryType.EQ)
+    private Integer updater;
+
+    @Schema(description = "是否删除 0-未删 1-已删")
+    @QueryField(type = QueryType.EQ)
+    private Integer deleted;
+
+}

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

@@ -23,6 +23,7 @@ import java.math.RoundingMode;
 import java.security.SecureRandom;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -134,18 +135,6 @@ public class OrderBusinessService {
             throw new BusinessException("用户未登录");
         }
 
-        // 检查是否为测试账号
-        boolean isTestAccount = orderConfig.isTestAccount(loginUser.getPhone());
-
-        if (isTestAccount) {
-            // 测试账号：直接使用测试金额，跳过金额验证
-            BigDecimal testAmount = orderConfig.getTestAccount().getTestPayAmount();
-            request.setTotalPrice(testAmount);
-            log.info("测试账号订单，用户：{}，使用测试金额：{}", loginUser.getPhone(), testAmount);
-            return; // 测试账号跳过后续验证
-        }
-
-        // 非测试账号：正常验证流程
         // 验证商品信息并计算总金额
         BigDecimal calculatedTotal = validateAndCalculateTotal(request);
 
@@ -157,7 +146,6 @@ public class OrderBusinessService {
         if (request.getTotalPrice() != null &&
                 request.getTotalPrice().subtract(calculatedTotal).abs().compareTo(new BigDecimal("0.01")) > 0) {
             log.warn("订单金额计算不一致，前端传入：{}，后台计算：{}", request.getTotalPrice(), calculatedTotal);
-//            throw new BusinessException("订单金额计算错误，请刷新重试");
         }
 
         // 使用后台计算的金额
@@ -328,23 +316,6 @@ public class OrderBusinessService {
             shopOrder.setComments(orderConfig.getDefaultConfig().getDefaultComments());
         }
 
-        // 设置价格相关字段（解决数据库字段没有默认值的问题）
-        if (shopOrder.getPayPrice() == null) {
-            shopOrder.setPayPrice(shopOrder.getTotalPrice()); // 实际付款默认等于订单总额
-        }
-
-        if (shopOrder.getPrice() == null) {
-            shopOrder.setPrice(shopOrder.getTotalPrice()); // 用于统计的价格默认等于订单总额
-        }
-
-        if (shopOrder.getReducePrice() == null) {
-            shopOrder.setReducePrice(BigDecimal.ZERO); // 减少金额默认为0
-        }
-
-        if (shopOrder.getMoney() == null) {
-            shopOrder.setMoney(shopOrder.getTotalPrice()); // 用于积分赠送的价格默认等于订单总额
-        }
-
         // 设置默认状态
         shopOrder.setPayStatus(false); // 未付款
         shopOrder.setOrderStatus(0); // 未使用
@@ -378,6 +349,21 @@ public class OrderBusinessService {
                     shopOrder.setWaterTicketFlag(0);
                 }
 
+                //自配送才计算步梯费用业务【选择步梯配送方式、配送楼层大于1楼、商品已设置配送费】
+                if(Arrays.asList(1, 3).contains(shopOrder.getOrderType()) && shopOrder.getDeliveryMethod() == 1 && shopOrder.getDeliveryFloor() > 1
+                        && shopGoods.getDeliveryFee().compareTo(BigDecimal.ZERO) > 0){
+                    BigDecimal deliveryFee = BigDecimal.ZERO;
+                    if(shopGoods.getDeliveryFeeType() == 0 ){
+                        deliveryFee = BigDecimal.valueOf(shopOrder.getDeliveryFloor() - 1).multiply(shopGoods.getDeliveryFee()).multiply(BigDecimal.valueOf(goodsItem.getQuantity()));
+                    }else if(shopOrder.getDeliveryFloor() > 1){
+                        deliveryFee = shopGoods.getDeliveryFee();
+                    }
+                    if(deliveryFee.compareTo(BigDecimal.ZERO) > 0){
+                        shopOrder.setDeliveryFee(deliveryFee);
+                        shopOrder.setTotalPrice(shopOrder.getTotalPrice().add(deliveryFee));
+                    }
+                }
+
                 //单一配送方式商品如用户没选择配送方式按商品默认配送属性设定订单类型
                 String deliveryType = shopGoods.getDeliveryType();
                 if(orderType == null && StrUtil.isNotBlank(deliveryType) && !deliveryType.contains(",")){
@@ -396,14 +382,31 @@ public class OrderBusinessService {
                             break;
                         }
                         default:{
-                            orderType = 1;
+                            orderType = 5;
                         }
                     }
                 }
             }
         }
-        shopOrder.setOrderType(orderType);
 
+        // 设置价格相关字段（解决数据库字段没有默认值的问题）
+        if (shopOrder.getPayPrice() == null) {
+            shopOrder.setPayPrice(shopOrder.getTotalPrice()); // 实际付款默认等于订单总额
+        }
+
+        if (shopOrder.getPrice() == null) {
+            shopOrder.setPrice(shopOrder.getTotalPrice()); // 用于统计的价格默认等于订单总额
+        }
+
+        if (shopOrder.getReducePrice() == null) {
+            shopOrder.setReducePrice(BigDecimal.ZERO); // 减少金额默认为0
+        }
+
+        if (shopOrder.getMoney() == null) {
+            shopOrder.setMoney(shopOrder.getTotalPrice()); // 用于积分赠送的价格默认等于订单总额
+        }
+
+        shopOrder.setOrderType(orderType);
         return shopOrder;
     }
 
@@ -667,8 +670,8 @@ public class OrderBusinessService {
             throw new BusinessException("收货地址坐标异常，请重新选择收货地址");
         }
 
-        //订单类型：5-配送【系统自动识别电子围栏内转及时配送，电子围栏外发快递】
+        //订单类型：6-配送【系统自动识别电子围栏内转及时配送，电子围栏外发快递】
-        if(orderType != null && orderType == 5){
+        if(orderType != null && orderType == 6){
             Boolean exit = shopStoreFenceService.validatePointInEnabled(shopOrder.getTenantId(), lng, lat);
             if(exit){
                 shopOrder.setOrderType(1);

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

@@ -2,8 +2,10 @@ package com.gxwebsoft.shop.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.shop.dto.ShopDealerCapitalWaterDto;
 import com.gxwebsoft.shop.entity.ShopDealerCapital;
 import com.gxwebsoft.shop.param.ShopDealerCapitalParam;
+import com.gxwebsoft.shop.vo.ShopDealerCapitalWaterVO;
 
 import java.util.List;
 
@@ -23,6 +25,13 @@ public interface ShopDealerCapitalService extends IService<ShopDealerCapital> {
      */
     PageResult<ShopDealerCapital> pageRel(ShopDealerCapitalParam param);
 
+    /**
+     * 分页查询分销商个人流水
+     * @param waterDto
+     * @return
+     */
+    PageResult<ShopDealerCapitalWaterVO> myCapitalWater(ShopDealerCapitalWaterDto waterDto);
+
     /**
      * 关联查询全部
      *

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

@@ -5,6 +5,7 @@ import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.shop.entity.ShopDealerOrder;
 import com.gxwebsoft.shop.param.ShopDealerOrderParam;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -39,6 +40,12 @@ public interface ShopDealerOrderService extends IService<ShopDealerOrder> {
      */
     ShopDealerOrder getByIdRel(Integer id);
 
+    /**
+     * 查询门店/服务商本人今日收益
+     * @return
+     */
+    BigDecimal todayRevenue();
+
     /**
      * 手动触发单条订单的佣金解冻（保留与定时任务相同的前置条件检查）
      *

src/main/java/com/gxwebsoft/shop/service/ShopDealerUserService.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.ShopDealerRefundDto;
+import com.gxwebsoft.shop.dto.ShopDealerSettlementDto;
 import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto;
 import com.gxwebsoft.shop.entity.ShopDealerUser;
 import com.gxwebsoft.shop.param.ShopDealerUserParam;
@@ -58,4 +59,19 @@ public interface ShopDealerUserService extends IService<ShopDealerUser> {
      * @return
      */
     Boolean refundOrder(ShopDealerRefundDto refundDto);
+
+    /**
+     * 用户资金结算
+     * @param dto
+     * @return
+     */
+    Boolean settlementBatch(ShopDealerSettlementDto dto);
+
+    /**
+     * 开启/关闭分销商用户核销权限
+     * @param id
+     * @return
+     */
+    Boolean verifyEnable(Integer id);
+
 }

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

@@ -24,6 +24,13 @@ public interface ShopFlashSaleActivityService extends IService<ShopFlashSaleActi
      */
     PageResult<ShopFlashSaleActivityVO> pageRel(ShopFlashSaleActivityParam param);
 
+    /**
+     * 查询详情
+     * @param id
+     * @return
+     */
+    ShopFlashSaleActivityVO getInfoById(Integer id);
+
     /**
      * 关联查询全部
      *
@@ -45,7 +52,7 @@ public interface ShopFlashSaleActivityService extends IService<ShopFlashSaleActi
      * @param tenantId  租户ID
      * @return
      */
-    List<ShopFlashSaleActivityVO> getMyActive(Integer tenantId);
+    List<ShopFlashSaleActivityVO> getMyActive(Integer tenantId, Integer popFlag);
 
     /**
      * 修改秒杀活动状态

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

@@ -0,0 +1,42 @@
+package com.gxwebsoft.shop.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.shop.entity.ShopGoodsProfit;
+import com.gxwebsoft.shop.param.ShopGoodsProfitParam;
+
+import java.util.List;
+
+/**
+ * 商品分润设定Service
+ *
+ * @author xm
+ * @since 2026-05-20 14:33:00
+ */
+public interface ShopGoodsProfitService extends IService<ShopGoodsProfit> {
+
+    /**
+     * 分页关联查询
+     *
+     * @param param 查询参数
+     * @return PageResult<ShopGoodsProfit>
+     */
+    PageResult<ShopGoodsProfit> pageRel(ShopGoodsProfitParam param);
+
+    /**
+     * 关联查询全部
+     *
+     * @param param 查询参数
+     * @return List<ShopGoodsProfit>
+     */
+    List<ShopGoodsProfit> listRel(ShopGoodsProfitParam param);
+
+    /**
+     * 根据id查询
+     *
+     * @param id 主键ID
+     * @return ShopGoodsProfit
+     */
+    ShopGoodsProfit getByIdRel(Integer id);
+
+}

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

@@ -2,10 +2,13 @@ package com.gxwebsoft.shop.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.shop.dto.ShopOrderMyVerifyDto;
 import com.gxwebsoft.shop.dto.UserOrderStats;
 import com.gxwebsoft.shop.dto.VerifyShopOrderDto;
 import com.gxwebsoft.shop.entity.ShopOrder;
 import com.gxwebsoft.shop.param.ShopOrderParam;
+import com.gxwebsoft.shop.vo.ShopOrderGoodsInfoVO;
+import com.gxwebsoft.shop.vo.ShopOrderMyVerifyVO;
 
 import java.math.BigDecimal;
 import java.util.HashMap;
@@ -43,6 +46,12 @@ public interface ShopOrderService extends IService<ShopOrder> {
      */
     ShopOrder getByIdRel(Integer orderId);
 
+    /**
+     * 我已核销订单
+     * @return
+     */
+    ShopOrderMyVerifyVO myVerifyOrder(ShopOrderMyVerifyDto myVerifyDto);
+
     HashMap<String, String> createWxOrder(ShopOrder shopOrder);
 
     ShopOrder getByOutTradeNo(String outTradeNo);
@@ -94,4 +103,11 @@ public interface ShopOrderService extends IService<ShopOrder> {
      * @return
      */
     Boolean verifyOrder(VerifyShopOrderDto verifyDto);
+
+    /**
+     * 通过订单号查询订单商品名称
+     * @param orderNoList
+     * @return
+     */
+    List<ShopOrderGoodsInfoVO> getOrderGoodsInfoByOrderNos(List<String> orderNoList);
 }

src/main/java/com/gxwebsoft/shop/service/ShopVerifyUserService.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.ShopVerifyUser;
+import com.gxwebsoft.shop.param.ShopVerifyUserParam;
+
+import java.util.List;
+
+/**
+ * 订单核销人管理Service
+ *
+ * @author xm
+ * @since 2026-05-25 17:13:00
+ */
+public interface ShopVerifyUserService extends IService<ShopVerifyUser> {
+
+    /**
+     * 分页关联查询
+     *
+     * @param param 查询参数
+     * @return PageResult<ShopVerifyUser>
+     */
+    PageResult<ShopVerifyUser> pageRel(ShopVerifyUserParam param);
+
+    /**
+     * 关联查询全部
+     *
+     * @param param 查询参数
+     * @return List<ShopVerifyUser>
+     */
+    List<ShopVerifyUser> listRel(ShopVerifyUserParam param);
+
+    /**
+     * 根据id查询
+     *
+     * @param id 主键ID
+     * @return ShopVerifyUser
+     */
+    ShopVerifyUser getByIdRel(Integer id);
+
+    /**
+     * 通过用户ID查询
+     * @param userId
+     * @return
+     */
+    ShopVerifyUser getInfo(Integer userId);
+
+    /**
+     * 修改订单核销人开启状态
+     * @param id 主键ID
+     * @return
+     */
+    Boolean updateStatus(Integer id);
+
+    /**
+     * 修改订单核销人核销权限
+     * @param id 主键ID
+     * @return
+     */
+    Boolean updateVerifyFlag(Integer id);
+
+    /**
+     * 保存数据
+     * @param shopVerifyUser
+     * @return
+     */
+    Boolean saveInfo(ShopVerifyUser shopVerifyUser);
+
+}

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

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.PageResult;
 import com.gxwebsoft.shop.entity.ShopActiveImage;
+import com.gxwebsoft.shop.entity.ShopGoods;
 import com.gxwebsoft.shop.mapper.ShopActiveImageMapper;
+import com.gxwebsoft.shop.mapper.ShopGoodsMapper;
 import com.gxwebsoft.shop.param.ShopActiveImageParam;
 import com.gxwebsoft.shop.service.ShopActiveImageService;
 import lombok.AllArgsConstructor;
@@ -14,6 +16,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 推广码底图Service实现
@@ -25,16 +28,30 @@ import java.util.List;
 @AllArgsConstructor
 public class ShopActiveImageServiceImpl extends ServiceImpl<ShopActiveImageMapper, ShopActiveImage> implements ShopActiveImageService {
 
+    private ShopGoodsMapper shopGoodsMapper;
+
     @Override
     public PageResult<ShopActiveImage> pageRel(ShopActiveImageParam param) {
         PageParam<ShopActiveImage, ShopActiveImageParam> page = new PageParam<>(param);
         page.setDefaultOrder("sort_number asc, create_time desc");
         List<ShopActiveImage> list = baseMapper.selectPageRel(page, param);
         if(CollectionUtils.isNotEmpty(list)){
+            List<Integer> goodsIdList = list.stream().filter(shopActiveImage -> shopActiveImage.getGoodsId() != null).map(ShopActiveImage::getGoodsId)
+                    .distinct().collect(Collectors.toList());
+            List<ShopGoods> shopGoodsList = shopGoodsMapper.selectBatchIds(goodsIdList);
+
             list.forEach(shopActiveImage -> {
                 if(!StringUtils.isEmpty(shopActiveImage.getImgUrl())){
                     shopActiveImage.setImgUrlList(Arrays.asList(shopActiveImage.getImgUrl().split(",")));
                 }
+
+                //回显商品名称
+                if(shopActiveImage.getGoodsId() != null){
+                    ShopGoods shopGoods = shopGoodsList.stream().filter(goods -> shopActiveImage.getGoodsId().equals(goods.getGoodsId())).findFirst().orElse(null);
+                    if(shopGoods != null){
+                        shopActiveImage.setGoodsName(shopGoods.getName());
+                    }
+                }
             });
         }
         return new PageResult<>(list, page.getTotal());

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

@@ -1,14 +1,24 @@
 package com.gxwebsoft.shop.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.common.core.exception.BusinessException;
+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.dto.ShopDealerCapitalWaterDto;
 import com.gxwebsoft.shop.mapper.ShopDealerCapitalMapper;
 import com.gxwebsoft.shop.service.ShopDealerCapitalService;
 import com.gxwebsoft.shop.entity.ShopDealerCapital;
 import com.gxwebsoft.shop.param.ShopDealerCapitalParam;
 import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.PageResult;
+import com.gxwebsoft.shop.vo.ShopDealerCapitalWaterVO;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,6 +38,27 @@ public class ShopDealerCapitalServiceImpl extends ServiceImpl<ShopDealerCapitalM
         return new PageResult<>(list, page.getTotal());
     }
 
+    @Override
+    public PageResult<ShopDealerCapitalWaterVO> myCapitalWater(ShopDealerCapitalWaterDto entity) {
+        PageResult<ShopDealerCapitalWaterVO> pageResult = new PageResult<>();
+        User loginUser = LoginUserUtil.getLoginUser();
+        if(loginUser == null){
+            throw new BusinessException(GlobalErrorCodeConstants.UNAUTHORIZED.getMsg());
+        }
+        entity.setUserId(loginUser.getUserId());
+
+        IPage<ShopDealerCapitalWaterVO> pageInfo = baseMapper.getPageInfo(new Page<>(entity.getPage(), entity.getLimit()), entity);
+        if(CollectionUtils.isNotEmpty(pageInfo.getRecords())){
+            List<ShopDealerCapitalWaterVO> records = pageInfo.getRecords();
+            pageResult.setList(records);
+            pageResult.setCount(pageInfo.getTotal());
+        }else {
+            pageResult.setCount(0l);
+            pageResult.setList(new ArrayList<>());
+        }
+        return pageResult;
+    }
+
     @Override
     public List<ShopDealerCapital> listRel(ShopDealerCapitalParam param) {
         List<ShopDealerCapital> list = baseMapper.selectListRel(param);

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

@@ -4,25 +4,25 @@ 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.exception.BusinessException;
+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.glt.entity.GltTicketOrder;
 import com.gxwebsoft.glt.entity.GltTicketTemplate;
 import com.gxwebsoft.glt.entity.GltUserTicket;
 import com.gxwebsoft.glt.service.GltTicketOrderService;
 import com.gxwebsoft.glt.service.GltTicketTemplateService;
 import com.gxwebsoft.glt.service.GltUserTicketService;
-import com.gxwebsoft.shop.entity.ShopDealerCapital;
+import com.gxwebsoft.shop.entity.*;
-import com.gxwebsoft.shop.entity.ShopDealerOrder;
-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.shop.mapper.ShopDealerOrderMapper;
+import com.gxwebsoft.shop.mapper.ShopOrderMapper;
+import com.gxwebsoft.shop.param.ShopDealerOrderParam;
 import com.gxwebsoft.shop.service.ShopDealerCapitalService;
 import com.gxwebsoft.shop.service.ShopDealerOrderService;
-import com.gxwebsoft.shop.param.ShopDealerOrderParam;
+import com.gxwebsoft.shop.vo.ShopDealerOrderTodayRevenueVO;
-import com.gxwebsoft.common.core.web.PageParam;
-import com.gxwebsoft.common.core.web.PageResult;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.support.TransactionTemplate;
 
@@ -32,11 +32,7 @@ import java.math.RoundingMode;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.HashSet;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -105,6 +101,38 @@ public class ShopDealerOrderServiceImpl extends ServiceImpl<ShopDealerOrderMappe
         return param.getOne(baseMapper.selectListRel(param));
     }
 
+    @Override
+    public BigDecimal todayRevenue() {
+        BigDecimal todayRevenue = BigDecimal.ZERO;
+        User loginUser = LoginUserUtil.getLoginUser();
+        if(loginUser != null){
+            Integer userId = loginUser.getUserId();
+
+            List<ShopDealerOrderTodayRevenueVO> revenueVOList = baseMapper.getTodayRevenue(userId);
+            if(CollectionUtils.isNotEmpty(revenueVOList)){
+                for(ShopDealerOrderTodayRevenueVO revenueVO : revenueVOList){
+                    //已取消订单不统计
+                    if(Arrays.asList(2, 6).contains(revenueVO.getOrderStatus())){
+                        continue;
+                    }
+                    if(userId.equals(revenueVO.getFirstUserId()) && revenueVO.getFirstMoney().compareTo(BigDecimal.ZERO) > 0){
+                        todayRevenue = todayRevenue.add(revenueVO.getFirstMoney());
+                    }
+                    if(userId.equals(revenueVO.getSecondUserId()) && revenueVO.getSecondMoney().compareTo(BigDecimal.ZERO) > 0){
+                        todayRevenue = todayRevenue.add(revenueVO.getSecondMoney());
+                    }
+                    if(userId.equals(revenueVO.getFirstDividendUser()) && revenueVO.getFirstDividend().compareTo(BigDecimal.ZERO) > 0){
+                        todayRevenue = todayRevenue.add(revenueVO.getFirstDividend());
+                    }
+                    if(userId.equals(revenueVO.getSecondDividendUser()) && revenueVO.getSecondDividend().compareTo(BigDecimal.ZERO) > 0){
+                        todayRevenue = todayRevenue.add(revenueVO.getSecondDividend());
+                    }
+                }
+            }
+        }
+        return todayRevenue;
+    }
+
     // ==================== 手动解冻 ====================
 
     @Override

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

@@ -1,5 +1,6 @@
 package com.gxwebsoft.shop.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gxwebsoft.common.core.enums.ShopDealerCapitalUpdateEnum;
@@ -11,6 +12,8 @@ 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.ShopDealerRefundDto;
+import com.gxwebsoft.shop.dto.ShopDealerSettlementDto;
+import com.gxwebsoft.shop.dto.ShopDealerSettlementItemDto;
 import com.gxwebsoft.shop.dto.ShopDealerUserReduceDto;
 import com.gxwebsoft.shop.entity.ShopDealerCapital;
 import com.gxwebsoft.shop.entity.ShopDealerUser;
@@ -101,6 +104,7 @@ public class ShopDealerUserServiceImpl extends ServiceImpl<ShopDealerUserMapper,
         log.error("分销账户资金变更明细：" + entity);
         ShopDealerTypeEnum typeEnum = entity.getTypeEnum();
         ShopDealerCapitalUpdateEnum updateEnum = entity.getUpdateEnum();
+        LocalDateTime now = LocalDateTime.now();
 
         //2.变动类型为 1-操作冻结账户余额 2-操作提现账户余额【直接结算】是需判断金额值问题
         if(ShopDealerTypeEnum.FREEZE_ACCOUNT.equals(typeEnum) || ShopDealerTypeEnum.WITHDRAW_ACCOUNT.equals(typeEnum)){
@@ -113,7 +117,10 @@ public class ShopDealerUserServiceImpl extends ServiceImpl<ShopDealerUserMapper,
                 case MANAGEMENT_INCOME:
                 case DIVIDEND_INCOME:
                 case PROMOTION_INCOME:
+                case PROMOTION_PARENT_INCOME:
                 case TRANSFER_INCOME:
+                case DELIVERY_REWARD:
+                case DELIVERY_FLOOR_FEE:
                 case DELIVERY_INCOME:{
                     break;
                 }
@@ -149,7 +156,7 @@ public class ShopDealerUserServiceImpl extends ServiceImpl<ShopDealerUserMapper,
                 dealerCapital.setComments(updateEnum.getDescription());
                 dealerCapital.setToUserId(entity.getOrderUserId());
                 dealerCapital.setTenantId(TENANT_ID);
-                dealerCapital.setCreateTime(LocalDateTime.now());
+                dealerCapital.setCreateTime(now);
                 User loginUser = LoginUserUtil.getLoginUser();
                 if(loginUser != null){
                     dealerCapital.setCreator(loginUser.getUserId());
@@ -164,7 +171,6 @@ public class ShopDealerUserServiceImpl extends ServiceImpl<ShopDealerUserMapper,
                 dealerUser.setTotalMoney(dealerUser.getTotalMoney().add(price));
                 baseMapper.updateById(dealerUser);
 
-
                 //4.2 生成流水
                 ShopDealerCapital dealerCapital = new ShopDealerCapital();
                 dealerCapital.setNo(no);
@@ -177,8 +183,9 @@ public class ShopDealerUserServiceImpl extends ServiceImpl<ShopDealerUserMapper,
                 dealerCapital.setFreezeMoneyAfter(dealerUser.getFreezeMoney());
                 dealerCapital.setComments(updateEnum.getDescription());
                 dealerCapital.setToUserId(entity.getOrderUserId());
+                dealerCapital.setPaymentFlag(1);
                 dealerCapital.setTenantId(TENANT_ID);
-                dealerCapital.setCreateTime(LocalDateTime.now());
+                dealerCapital.setCreateTime(now);
                 User loginUser = LoginUserUtil.getLoginUser();
                 if(loginUser != null){
                     dealerCapital.setCreator(loginUser.getUserId());
@@ -207,7 +214,8 @@ public class ShopDealerUserServiceImpl extends ServiceImpl<ShopDealerUserMapper,
                 userCapitalMap.forEach((k, value) ->{
 
                     //5.4 查询是否存在待解冻订单数据
-                    ShopDealerCapital userCapital = value.stream().filter(capital -> ShopDealerTypeEnum.FREEZE_ACCOUNT.getCode().equals(capital.getType())).findFirst().orElse(null);
+                    ShopDealerCapital userCapital = value.stream().filter(capital -> ShopDealerTypeEnum.FREEZE_ACCOUNT.getCode().equals(capital.getType()) && capital.getPaymentFlag() != null
+                            && capital.getPaymentFlag() == 0).findFirst().orElse(null);
                     if(userCapital != null){
 
                         //5.5 查询此订单是否已结算
@@ -237,15 +245,21 @@ public class ShopDealerUserServiceImpl extends ServiceImpl<ShopDealerUserMapper,
                                 dealerCapital.setMoneyAfter(dealerUser.getMoney());
                                 dealerCapital.setComments(updateEnum.getDescription());
                                 dealerCapital.setToUserId(entity.getOrderUserId());
+                                dealerCapital.setPaymentFlag(1);
                                 dealerCapital.setTenantId(TENANT_ID);
-                                dealerCapital.setCreateTime(LocalDateTime.now());
+                                dealerCapital.setCreateTime(now);
                                 User loginUser = LoginUserUtil.getLoginUser();
                                 if (loginUser != null) {
                                     dealerCapital.setCreator(loginUser.getUserId());
                                 }
                                 shopDealerCapitalMapper.insert(dealerCapital);
+                                userCapital.setPaymentFlag(1);
                             }
                         }
+
+                        //5.6 更新冻结流水为已结算状态
+                        userCapital.setUpdateTime(now);
+                        shopDealerCapitalMapper.updateById(userCapital);
                     }
                 });
             }else {
@@ -267,8 +281,9 @@ public class ShopDealerUserServiceImpl extends ServiceImpl<ShopDealerUserMapper,
                         .eq(ShopDealerCapital::getOrderNo, entity.getOrderNo())
                         .in(ShopDealerCapital::getFlowType, Arrays.asList(ShopDealerCapitalUpdateEnum.DISTRIBUTION_INCOME.getType(),
                                 ShopDealerCapitalUpdateEnum.MANAGEMENT_INCOME.getType(), ShopDealerCapitalUpdateEnum.DIVIDEND_INCOME.getType(),
-                                ShopDealerCapitalUpdateEnum.PROMOTION_INCOME.getType(), ShopDealerCapitalUpdateEnum.FREEZE_MONEY_THAW.getType(),
+                                ShopDealerCapitalUpdateEnum.PROMOTION_INCOME.getType(), ShopDealerCapitalUpdateEnum.PROMOTION_PARENT_INCOME.getType(),
-                                ShopDealerCapitalUpdateEnum.DELIVERY_INCOME.getType()))
+                                ShopDealerCapitalUpdateEnum.FREEZE_MONEY_THAW.getType(), ShopDealerCapitalUpdateEnum.DELIVERY_INCOME.getType(),
+                                ShopDealerCapitalUpdateEnum.DELIVERY_REWARD.getType(), ShopDealerCapitalUpdateEnum.DELIVERY_FLOOR_FEE.getType()))
                         .isNotNull(ShopDealerCapital::getUserId)
         );
 
@@ -313,15 +328,15 @@ public class ShopDealerUserServiceImpl extends ServiceImpl<ShopDealerUserMapper,
             List<ShopDealerUser> finalShopDealerUserList = shopDealerUserList;
             BigDecimal finalRate = rate;
             userDealerMap.forEach((k, value) ->{
-                BigDecimal money = value.stream().map(ShopDealerCapital::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add).multiply(finalRate);
+                BigDecimal money = value.stream().map(ShopDealerCapital::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add).multiply(finalRate).setScale(3, RoundingMode.HALF_UP);
-                BigDecimal freezeMoney = value.stream().map(ShopDealerCapital::getFreezeMoney).reduce(BigDecimal.ZERO, BigDecimal::add).multiply(finalRate);
+                BigDecimal freezeMoney = value.stream().map(ShopDealerCapital::getFreezeMoney).reduce(BigDecimal.ZERO, BigDecimal::add).multiply(finalRate).setScale(3, RoundingMode.HALF_UP);
 
                 ShopDealerUser dealerUser = finalShopDealerUserList.stream().filter(shopDealerUser -> k.equals(shopDealerUser.getUserId())).findFirst().orElse(null);
                 if(dealerUser != null){
                     //11.修改分销用户账户信息
-                    dealerUser.setMoney(dealerUser.getMoney().subtract(money));
+                    dealerUser.setMoney(dealerUser.getMoney().subtract(money).compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : dealerUser.getMoney().subtract(money));
-                    dealerUser.setFreezeMoney(dealerUser.getFreezeMoney().subtract(freezeMoney));
+                    dealerUser.setFreezeMoney(dealerUser.getFreezeMoney().subtract(freezeMoney).compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : dealerUser.getFreezeMoney().subtract(freezeMoney));
-                    dealerUser.setTotalMoney(dealerUser.getTotalMoney().subtract(money.add(freezeMoney)));
+                    dealerUser.setTotalMoney(dealerUser.getTotalMoney().subtract(money.add(freezeMoney)).compareTo(BigDecimal.ZERO) < 0 ? BigDecimal.ZERO : dealerUser.getTotalMoney().subtract(money.add(freezeMoney)));
                     dealerUser.setUpdateTime(LocalDateTime.now());
                     shopDealerUserUpdateList.add(dealerUser);
 
@@ -364,6 +379,69 @@ public class ShopDealerUserServiceImpl extends ServiceImpl<ShopDealerUserMapper,
         }
     }
 
+    @Override
+    @Transactional
+    public Boolean settlementBatch(ShopDealerSettlementDto entity) {
+        if(entity != null && CollectionUtils.isNotEmpty(entity.getItemList())){
+            LocalDateTime now = LocalDateTime.now();
+            List<ShopDealerSettlementItemDto> itemList = entity.getItemList();
+
+            List<Integer> userIdList = itemList.stream().map(ShopDealerSettlementItemDto::getUserId).distinct().collect(Collectors.toList());
+
+            List<ShopDealerUser> shopDealerUserList = baseMapper.selectList(new LambdaQueryWrapper<ShopDealerUser>().select(ShopDealerUser::getId, ShopDealerUser::getUserId,
+                            ShopDealerUser::getMoney, ShopDealerUser::getTotalMoney, ShopDealerUser::getFreezeMoney).in(ShopDealerUser::getUserId, userIdList));
+
+            List<ShopDealerUser> updateDealerUserList = new ArrayList<>();
+            List<ShopDealerCapital> capitalList = new ArrayList<>();
+            itemList.forEach(item ->{
+                ShopDealerUser dealerUser = shopDealerUserList.stream().filter(shopDealerUser -> item.getUserId().equals(shopDealerUser.getUserId())).findFirst().orElse(null);
+                if(dealerUser != null){
+                    dealerUser.setMoney(dealerUser.getMoney().add(item.getMoney()));
+                    dealerUser.setTotalMoney(dealerUser.getTotalMoney().add(item.getMoney()));
+                    dealerUser.setUpdateTime(now);
+                    updateDealerUserList.add(dealerUser);
+
+                    ShopDealerCapital capital = BeanUtil.toBean(entity, ShopDealerCapital.class);
+                    capital.setNo(item.getNo());
+                    capital.setUserId(item.getUserId());
+                    capital.setMoney(item.getMoney());
+                    capital.setMoneyAfter(dealerUser.getMoney());
+                    capital.setFreezeMoneyAfter(dealerUser.getFreezeMoney());
+                    capital.setCreateTime(now);
+                    capitalList.add(capital);
+                }
+            });
+
+            if(CollectionUtils.isNotEmpty(updateDealerUserList)){
+                updateBatchById(updateDealerUserList);
+            }
+
+            if(CollectionUtils.isNotEmpty(capitalList)){
+                shopDealerCapitalService.saveBatch(capitalList);
+            }
+        }
+        return Boolean.TRUE;
+    }
+
+    @Override
+    public Boolean verifyEnable(Integer id) {
+        ShopDealerUser dealerUser = baseMapper.selectById(id);
+        if(dealerUser != null){
+            if(dealerUser.getVerifyFlag()){
+                dealerUser.setVerifyFlag(false);
+            }else {
+                dealerUser.setVerifyFlag(true);
+            }
+            dealerUser.setUpdateTime(LocalDateTime.now());
+            User loginUser = LoginUserUtil.getLoginUser();
+            if(loginUser != null){
+                dealerUser.setUpdater(loginUser.getUserId());
+            }
+            baseMapper.updateById(dealerUser);
+        }
+        return Boolean.TRUE;
+    }
+
     public ShopDealerUser getDealerUser(Integer userId){
         ShopDealerUser shopDealerUser = baseMapper.selectOne(new LambdaQueryWrapper<ShopDealerUser>().eq(ShopDealerUser::getUserId, userId));
         if(shopDealerUser == null){

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

@@ -64,6 +64,23 @@ public class ShopFlashSaleActivityServiceImpl extends ServiceImpl<ShopFlashSaleA
         return new PageResult<>(list, page.getTotal());
     }
 
+    @Override
+    public ShopFlashSaleActivityVO getInfoById(Integer id) {
+        ShopFlashSaleActivity saleActivity = baseMapper.selectById(id);
+        ShopFlashSaleActivityVO result = BeanUtil.toBean(saleActivity, ShopFlashSaleActivityVO.class);
+        if(result.getGoodsId() != null){
+            ShopGoods shopGood = shopGoodsMapper.selectById(result.getGoodsId());
+            if(shopGood != null){
+                result.setGoodsPrice(shopGood.getPrice());
+                result.setGoodsTotalPrice(shopGood.getPrice().multiply(new BigDecimal(result.getNum())));
+                result.setGoodsName(shopGood.getName());
+                result.setImage(shopGood.getImage());
+                result.setUnitName(shopGood.getUnitName());
+            }
+        }
+        return result;
+    }
+
     @Override
     public List<ShopFlashSaleActivity> listRel(ShopFlashSaleActivityParam param) {
         List<ShopFlashSaleActivity> list = baseMapper.selectListRel(param);
@@ -81,14 +98,13 @@ public class ShopFlashSaleActivityServiceImpl extends ServiceImpl<ShopFlashSaleA
     }
 
     @Override
-    public List<ShopFlashSaleActivityVO> getMyActive(Integer tenantId) {
+    public List<ShopFlashSaleActivityVO> getMyActive(Integer tenantId, Integer popFlag) {
         List<ShopFlashSaleActivityVO> resultVOList = new ArrayList<>();
         User loginUser = LoginUserUtil.getLoginUser();
         if(loginUser == null){
             throw new BusinessException(GlobalErrorCodeConstants.UNAUTHORIZED.getMsg());
         }
 
-
         Boolean newUser = true;
         //判断是否为新用户【只要未成功下单都判定为新用户】
         LambdaQueryWrapper<ShopOrder> shopOrderLambdaQueryWrapper = new LambdaQueryWrapper<ShopOrder>().eq(ShopOrder::getUserId, loginUser.getUserId()).eq(ShopOrder::getPayStatus, 1)
@@ -101,15 +117,19 @@ public class ShopFlashSaleActivityServiceImpl extends ServiceImpl<ShopFlashSaleA
         //查询满足条件的活动数据
         LambdaQueryChainWrapper<ShopFlashSaleActivity> activityWrapper = lambdaQuery().eq(ShopFlashSaleActivity::getStatus, 0).gt(ShopFlashSaleActivity::getStock, 0).eq(ShopFlashSaleActivity::getTenantId, tenantId)
                 .apply("NOW() BETWEEN start_time AND end_time");
+        if(popFlag != null){
+            activityWrapper.eq(ShopFlashSaleActivity::getPopFlag, popFlag);
+        }
 
         Map<Integer, Integer> activityMap = new HashMap<>();
         if(!newUser){
             //查询当前用户是否有下过秒杀活动订单数据【判断下单数量是否超过限制】
             List<Integer> activityIdList = activityWrapper.list().stream().map(ShopFlashSaleActivity::getId).collect(Collectors.toList());
-            LambdaQueryWrapper<ShopOrder> shopOrderWrapper = new LambdaQueryWrapper<ShopOrder>().select(ShopOrder::getOrderId, ShopOrder::getActivityId, ShopOrder::getTotalNum)
+            if(CollectionUtils.isNotEmpty(activityIdList)){
-                    .eq(ShopOrder::getUserId, loginUser.getUserId()).in(ShopOrder::getActivityId, activityIdList).in(ShopOrder::getOrderStatus, Arrays.asList(0, 1));
+                LambdaQueryWrapper<ShopOrder> shopOrderWrapper = new LambdaQueryWrapper<ShopOrder>().select(ShopOrder::getOrderId, ShopOrder::getActivityId, ShopOrder::getTotalNum)
-            activityMap = shopOrderMapper.selectList(shopOrderWrapper).stream().collect(Collectors.groupingBy(ShopOrder::getActivityId, Collectors.summingInt(ShopOrder::getTotalNum)));
+                        .eq(ShopOrder::getUserId, loginUser.getUserId()).in(ShopOrder::getActivityId, activityIdList).in(ShopOrder::getOrderStatus, Arrays.asList(0, 1));
-
+                activityMap = shopOrderMapper.selectList(shopOrderWrapper).stream().collect(Collectors.groupingBy(ShopOrder::getActivityId, Collectors.summingInt(ShopOrder::getTotalNum)));
+            }
             activityWrapper.eq(ShopFlashSaleActivity::getDisplayType, 0);
         }
         activityWrapper.orderByAsc(ShopFlashSaleActivity::getSortNumber);

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

@@ -0,0 +1,49 @@
+package com.gxwebsoft.shop.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.shop.mapper.ShopGoodsProfitMapper;
+import com.gxwebsoft.shop.service.ShopGoodsProfitService;
+import com.gxwebsoft.shop.entity.ShopGoodsProfit;
+import com.gxwebsoft.shop.param.ShopGoodsProfitParam;
+import com.gxwebsoft.common.core.web.PageParam;
+import com.gxwebsoft.common.core.web.PageResult;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 商品分润设定Service实现
+ *
+ * @author xm
+ * @since 2026-05-20 14:33:00
+ */
+@Service
+@AllArgsConstructor
+public class ShopGoodsProfitServiceImpl extends ServiceImpl<ShopGoodsProfitMapper, ShopGoodsProfit> implements ShopGoodsProfitService {
+
+    @Override
+    public PageResult<ShopGoodsProfit> pageRel(ShopGoodsProfitParam param) {
+        PageParam<ShopGoodsProfit, ShopGoodsProfitParam> page = new PageParam<>(param);
+        page.setDefaultOrder("sort_number asc, create_time desc");
+        List<ShopGoodsProfit> list = baseMapper.selectPageRel(page, param);
+        return new PageResult<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<ShopGoodsProfit> listRel(ShopGoodsProfitParam param) {
+        List<ShopGoodsProfit> list = baseMapper.selectListRel(param);
+        // 排序
+        PageParam<ShopGoodsProfit, ShopGoodsProfitParam> page = new PageParam<>();
+        page.setDefaultOrder("sort_number asc, create_time desc");
+        return page.sortRecords(list);
+    }
+
+    @Override
+    public ShopGoodsProfit getByIdRel(Integer id) {
+        ShopGoodsProfitParam param = new ShopGoodsProfitParam();
+        param.setId(id);
+        return param.getOne(baseMapper.selectListRel(param));
+    }
+
+}

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

@@ -1,5 +1,6 @@
 package com.gxwebsoft.shop.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gxwebsoft.shop.mapper.ShopGoodsMapper;
@@ -11,7 +12,9 @@ import com.gxwebsoft.common.core.web.PageResult;
 import org.springframework.stereotype.Service;
 import lombok.extern.slf4j.Slf4j;
 
+import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * 商品Service实现
@@ -28,6 +31,13 @@ public class ShopGoodsServiceImpl extends ServiceImpl<ShopGoodsMapper, ShopGoods
         PageParam<ShopGoods, ShopGoodsParam> page = new PageParam<>(param);
         page.setDefaultOrder("sort_number asc, create_time desc");
         List<ShopGoods> list = baseMapper.selectPageRel(page, param);
+        list.forEach(shopGoods ->{
+            String deliveryType = shopGoods.getDeliveryType();
+            if(StrUtil.isNotBlank(deliveryType)){
+                List<Integer> deliveryTypeList = Arrays.stream(deliveryType.split(",")).map(Integer::parseInt).collect(Collectors.toList());
+                shopGoods.setDeliveryTypeList(deliveryTypeList);
+            }
+        });
         return new PageResult<>(list, page.getTotal());
     }
 
@@ -37,6 +47,13 @@ public class ShopGoodsServiceImpl extends ServiceImpl<ShopGoodsMapper, ShopGoods
         // 排序
         PageParam<ShopGoods, ShopGoodsParam> page = new PageParam<>();
         page.setDefaultOrder("sort_number asc, create_time desc");
+        list.forEach(shopGoods ->{
+            String deliveryType = shopGoods.getDeliveryType();
+            if(StrUtil.isNotBlank(deliveryType)){
+                List<Integer> deliveryTypeList = Arrays.stream(deliveryType.split(",")).map(Integer::parseInt).collect(Collectors.toList());
+                shopGoods.setDeliveryTypeList(deliveryTypeList);
+            }
+        });
         return page.sortRecords(list);
     }
 
@@ -44,7 +61,12 @@ public class ShopGoodsServiceImpl extends ServiceImpl<ShopGoodsMapper, ShopGoods
     public ShopGoods getByIdRel(Integer goodsId) {
         ShopGoodsParam param = new ShopGoodsParam();
         param.setGoodsId(goodsId);
-        return param.getOne(baseMapper.selectListRel(param));
+        ShopGoods shopGoods = param.getOne(baseMapper.selectListRel(param));
+        if(shopGoods != null && StrUtil.isNotBlank(shopGoods.getDeliveryType())){
+            List<Integer> deliveryTypeList = Arrays.stream(shopGoods.getDeliveryType().split(",")).map(Integer::parseInt).collect(Collectors.toList());
+            shopGoods.setDeliveryTypeList(deliveryTypeList);
+        }
+        return shopGoods;
     }
 
     @InterceptorIgnore(tenantLine = "true")

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

@@ -2,14 +2,19 @@ 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.ShopOrderGoodsMapper;
-import com.gxwebsoft.shop.service.ShopOrderGoodsService;
-import com.gxwebsoft.shop.entity.ShopOrderGoods;
-import com.gxwebsoft.shop.param.ShopOrderGoodsParam;
 import com.gxwebsoft.common.core.web.PageParam;
 import com.gxwebsoft.common.core.web.PageResult;
-import org.springframework.stereotype.Service;
+import com.gxwebsoft.shop.entity.ShopFlashSaleActivity;
+import com.gxwebsoft.shop.entity.ShopOrder;
+import com.gxwebsoft.shop.entity.ShopOrderGoods;
+import com.gxwebsoft.shop.mapper.ShopFlashSaleActivityMapper;
+import com.gxwebsoft.shop.mapper.ShopOrderGoodsMapper;
+import com.gxwebsoft.shop.mapper.ShopOrderMapper;
+import com.gxwebsoft.shop.param.ShopOrderGoodsParam;
+import com.gxwebsoft.shop.service.ShopOrderGoodsService;
+import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
 
 import java.util.List;
 
@@ -21,8 +26,13 @@ import java.util.List;
  */
 @Slf4j
 @Service
+@AllArgsConstructor
 public class ShopOrderGoodsServiceImpl extends ServiceImpl<ShopOrderGoodsMapper, ShopOrderGoods> implements ShopOrderGoodsService {
 
+    private ShopOrderMapper shopOrderMapper;
+
+    private ShopFlashSaleActivityMapper shopFlashSaleActivityMapper;
+
     @Override
     public PageResult<ShopOrderGoods> pageRel(ShopOrderGoodsParam param) {
         PageParam<ShopOrderGoods, ShopOrderGoodsParam> page = new PageParam<>(param);
@@ -34,6 +44,27 @@ public class ShopOrderGoodsServiceImpl extends ServiceImpl<ShopOrderGoodsMapper,
     @Override
     public List<ShopOrderGoods> listRel(ShopOrderGoodsParam param) {
         List<ShopOrderGoods> list = baseMapper.selectListRel(param);
+        //根据订单ID查询活动并回显对应名称、订单核销码
+        Integer orderId = param.getOrderId();
+        if(orderId != null){
+            ShopOrder order = shopOrderMapper.selectById(orderId);
+            if(order != null){
+                ShopFlashSaleActivity saleActivity = null;
+                if(order.getActivityId() != null){
+                    saleActivity = shopFlashSaleActivityMapper.selectById(order.getActivityId());
+                }
+                for(ShopOrderGoods orderGoods : list){
+                    orderGoods.setOrderStatus(order.getOrderStatus());
+                    orderGoods.setVerifyCode(order.getVerifyCode());
+                    if(saleActivity != null){
+                        if(orderGoods.getGoodsId().equals(saleActivity.getGoodsId())){
+                            orderGoods.setActiveNam(saleActivity.getName());
+                        }
+                    }
+                }
+            }
+        }
+
         // 排序
         PageParam<ShopOrderGoods, ShopOrderGoodsParam> page = new PageParam<>();
         page.setDefaultOrder("sort_number asc, create_time desc");

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

@@ -3,6 +3,8 @@ package com.gxwebsoft.shop.service.impl;
 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.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.gxwebsoft.common.core.config.CertificateProperties;
 import com.gxwebsoft.common.core.config.ConfigProperties;
@@ -10,6 +12,7 @@ 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.BusinessException;
 import com.gxwebsoft.common.core.exception.enums.GlobalErrorCodeConstants;
 import com.gxwebsoft.common.core.service.EnvironmentAwarePaymentService;
 import com.gxwebsoft.common.core.service.PaymentCacheService;
@@ -23,13 +26,15 @@ 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.ShopOrderMyVerifyDto;
 import com.gxwebsoft.shop.dto.VerifyShopOrderDto;
 import com.gxwebsoft.shop.entity.*;
-import com.gxwebsoft.shop.mapper.ShopGoodsMapper;
+import com.gxwebsoft.shop.mapper.*;
-import com.gxwebsoft.shop.mapper.ShopOrderMapper;
-import com.gxwebsoft.shop.mapper.ShopUserAddressMapper;
 import com.gxwebsoft.shop.param.ShopOrderParam;
 import com.gxwebsoft.shop.service.*;
+import com.gxwebsoft.shop.vo.ShopOrderGoodsInfoVO;
+import com.gxwebsoft.shop.vo.ShopOrderMyVerifyItemVO;
+import com.gxwebsoft.shop.vo.ShopOrderMyVerifyVO;
 import com.wechat.pay.java.core.Config;
 import com.wechat.pay.java.core.RSAAutoCertificateConfig;
 import com.wechat.pay.java.core.RSAConfig;
@@ -41,14 +46,15 @@ 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.apache.commons.collections4.CollectionUtils;
 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;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.OffsetDateTime;
 import java.util.*;
@@ -109,6 +115,10 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
     private ShopDealerUserService shopDealerUserService;
     @Resource
     private UserMapper userMapper;
+    @Resource
+    private ShopFlashSaleActivityMapper shopFlashSaleActivityMapper;
+    @Resource
+    private ShopVerifyUserMapper shopVerifyUserMapper;
 
     private static final long USER_ORDER_STATS_CACHE_SECONDS = 60L;
     private static final long WECHAT_PREPAY_SNAPSHOT_TTL_MINUTES = 30L;
@@ -276,7 +286,7 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
             urls.add(legacySystem);
         }
 
-        if ("dev".equals(active)) {
+        if ("local".equals(active)) {
             String devNotify = devShopOrderNotifyUrl(order.getTenantId());
             if (StrUtil.isNotBlank(devNotify)) {
                 urls.add(devNotify);
@@ -298,10 +308,18 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
         List<ShopOrder> list = baseMapper.selectPageRel(page, param);
 
         // 整理订单数据
-        if (!CollectionUtils.isEmpty(list)) {
+        if (CollectionUtils.isNotEmpty(list)) {
             final Set<Integer> orderIds = list.stream().map(ShopOrder::getOrderId).collect(Collectors.toSet());
             final List<ShopOrderGoods> goodsList = shopOrderGoodsService.list(new LambdaQueryWrapper<ShopOrderGoods>().in(ShopOrderGoods::getOrderId, orderIds));
             final Map<Integer, List<ShopOrderGoods>> collect = goodsList.stream().collect(Collectors.groupingBy(ShopOrderGoods::getOrderId));
+
+            List<ShopFlashSaleActivity> activityList = new ArrayList<>();
+            List<Integer> activeIdList = list.stream().filter(shopOrder -> shopOrder.getActivityId() != null).map(ShopOrder::getActivityId).distinct().collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(activeIdList)){
+                activityList = shopFlashSaleActivityMapper.selectBatchIds(activeIdList);
+            }
+
+            List<ShopFlashSaleActivity> finalActivityList = activityList;
             list.forEach(d -> {
                 d.setOrderGoods(collect.get(d.getOrderId()));
 
@@ -320,6 +338,14 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
                     }
                     d.setShopOrderDelivery(shopOrderDelivery);
                 }
+
+                //回显活动名称
+                if(d.getActivityId() != null){
+                    ShopFlashSaleActivity saleActivity = finalActivityList.stream().filter(activity -> d.getActivityId().equals(activity.getId())).findFirst().orElse(null);
+                    if(saleActivity != null){
+                        d.setActivityName(saleActivity.getName());
+                    }
+                }
             });
         }
         return new PageResult<>(list, page.getTotal());
@@ -339,15 +365,75 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
         ShopOrderParam param = new ShopOrderParam();
         param.setOrderId(orderId);
         ShopOrder order = param.getOne(baseMapper.selectListRel(param));
-        if(order != null && order.getAddressId() != null){
+        if(order != null){
-            ShopUserAddress shopUserAddress = shopUserAddressMapper.selectById(order.getAddressId());
+            //回显地址
-            if(shopUserAddress != null && StrUtil.isNotBlank(shopUserAddress.getFullAddress())){
+            if(order.getAddressId() != null){
-                order.setFullAddress(shopUserAddress.getFullAddress());
+                ShopUserAddress shopUserAddress = shopUserAddressMapper.selectById(order.getAddressId());
+                if(shopUserAddress != null && StrUtil.isNotBlank(shopUserAddress.getFullAddress())){
+                    order.setFullAddress(shopUserAddress.getFullAddress());
+                }
             }
+
+            //回显核销人
+            if(order.getVerifyUser() != null){
+                User verifyUser = userMapper.getById(order.getVerifyUser());
+                if(verifyUser != null){
+                    order.setVerifyUserName(verifyUser.getRealName());
+                }
+            }
+
         }
         return order;
     }
 
+    @Override
+    public ShopOrderMyVerifyVO myVerifyOrder(ShopOrderMyVerifyDto entity) {
+        ShopOrderMyVerifyVO myVerifyVO = new ShopOrderMyVerifyVO();
+        User loginUser = LoginUserUtil.getLoginUser();
+        if(loginUser == null){
+            return myVerifyVO;
+        }else {
+            entity.setUserId(loginUser.getUserId());
+        }
+
+        IPage<ShopOrderMyVerifyItemVO> pageInfo = baseMapper.getMyVerifyPageInfo(new Page<>(entity.getPage(), entity.getLimit()), entity);
+        myVerifyVO.setCount(Math.toIntExact(pageInfo.getTotal()));
+        if(CollectionUtils.isNotEmpty(pageInfo.getRecords())){
+            List<ShopOrderMyVerifyItemVO> totalOrderList = pageInfo.getRecords();
+
+            //统计总订单数据
+            int totalGoodsNum = totalOrderList.stream().mapToInt(ShopOrderMyVerifyItemVO::getTotalNum).sum();
+            BigDecimal totalMoney = totalOrderList.stream().map(ShopOrderMyVerifyItemVO::getPayPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+            myVerifyVO.setTotalOrderNum(totalOrderList.size());
+            myVerifyVO.setTotalGoodsNum(totalGoodsNum);
+            myVerifyVO.setTotalMoney(totalMoney);
+
+            //统计当月数据
+            List<ShopOrderMyVerifyItemVO> currentMonthList = totalOrderList.stream().filter(item -> item.getCreateTime().getYear() == LocalDateTime.now().getYear()
+                            && item.getCreateTime().getMonthValue() == LocalDateTime.now().getMonthValue()).collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(currentMonthList)){
+                int monthGoodsNum = currentMonthList.stream().mapToInt(ShopOrderMyVerifyItemVO::getTotalNum).sum();
+                BigDecimal monthMoney = currentMonthList.stream().map(ShopOrderMyVerifyItemVO::getPayPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+                myVerifyVO.setMonthOrderNum(currentMonthList.size());
+                myVerifyVO.setMonthGoodsNum(monthGoodsNum);
+                myVerifyVO.setMonthMoney(monthMoney);
+            }
+
+            //统计快核订单
+            List<ShopOrderMyVerifyItemVO> liveOrderList = totalOrderList.stream().filter(item -> item.getVerifyMoney().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(liveOrderList)){
+                int liveGoodsNum = liveOrderList.stream().mapToInt(ShopOrderMyVerifyItemVO::getTotalNum).sum();
+                BigDecimal liveMoney = liveOrderList.stream().map(ShopOrderMyVerifyItemVO::getPayPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
+                myVerifyVO.setLiveOrderNum(liveOrderList.size());
+                myVerifyVO.setLiveGoodsNum(liveGoodsNum);
+                myVerifyVO.setLiveMoney(liveMoney);
+            }
+
+            myVerifyVO.setItemVOList(totalOrderList);
+        }
+        return myVerifyVO;
+    }
+
     @Override
     public com.gxwebsoft.shop.dto.UserOrderStats getUserOrderStats(Integer userId, Integer tenantId, Integer type) {
         if (userId == null) {
@@ -404,66 +490,85 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
             //1.判断用户是否登录
             User loginUser = LoginUserUtil.getLoginUser();
             if(loginUser == null){
-                throw new RuntimeException(GlobalErrorCodeConstants.UNAUTHORIZED.getMsg());
+                throw new BusinessException(GlobalErrorCodeConstants.UNAUTHORIZED.getMsg());
             }
 
             //2.判断是否有核销权限
             Integer verifyType = verifyDto.getVerifyType();
             if(verifyType == 2){
-                User user = userMapper.getById(loginUser.getUserId());
+                ShopVerifyUser verifyUser = shopVerifyUserMapper.selectOne(new LambdaQueryWrapper<ShopVerifyUser>().eq(ShopVerifyUser::getUserId, loginUser.getUserId()));
-                if(!(user != null && user.getVerifyFlag() != null && user.getVerifyFlag() == 1)){
+                if(!(verifyUser != null && verifyUser.getVerifyFlag() == 1 && verifyUser.getStatus() == 1)){
-                    throw new RuntimeException("暂无核销权限！");
+                    throw new BusinessException("暂无核销权限！");
                 }
             }
 
             //3.查询订单信息
             ShopOrder shopOrder = baseMapper.selectOne(new LambdaQueryWrapper<ShopOrder>().eq(ShopOrder::getVerifyCode, verifyDto.getVerifyCode()));
             if(shopOrder == null){
-                throw new RuntimeException(GlobalErrorCodeConstants.NOT_FOUND.getMsg());
+                throw new BusinessException(GlobalErrorCodeConstants.NOT_FOUND.getMsg());
             }
 
             //4.判断当前订单状态是否允许核销
             if(Arrays.asList(2,3,4,6,7).contains(shopOrder.getOrderStatus())){
-                throw new RuntimeException("订单当前状态不可核销！");
+                throw new BusinessException("订单当前状态不可核销！");
             }
 
             //5.判断订单是否已支付
             if(!shopOrder.getPayStatus()){
-                throw new RuntimeException("订单未支付，不可核销！");
+                throw new BusinessException("订单未支付，不可核销！");
             }
 
             //6.判断是否已核销
             if(shopOrder.getVerifyStatus() != null && shopOrder.getVerifyStatus() == 1){
-                throw  new RuntimeException("此订单已核销,无需重复核销！");
+                throw  new BusinessException("此订单已核销,无需重复核销！");
             }
 
             shopOrder.setVerifyStatus(1);
             shopOrder.setVerifyTime(LocalDateTime.now());
-            shopOrder.setVerifyUser(loginUser.getUserId());
 
-            //7.只有推广结算才会记佣且判断是否在设定有效期内核销订单【是：计算订单核销佣金 否：不计算核销佣金】
+            //7.判断订单是否超过3天，超过3天可核销完成，但是不记录个人业绩
+            LocalDateTime endTime = LocalDate.now().minusDays(3).atStartOfDay();
+            LocalDateTime createTime = shopOrder.getCreateTime();
+            if(createTime.isAfter(endTime)){
+                shopOrder.setVerifyUser(loginUser.getUserId());
+            }
+
+            //8.只有推广结算才会记佣且判断是否在设定有效期内核销订单【是：计算订单核销佣金 否：不计算核销佣金】
+            BigDecimal rate = shopOrder.getPayPrice().divide(shopOrder.getTotalPrice(), 3, RoundingMode.HALF_UP);
             if(verifyType == 2 && shopOrder.getVerifyExpTime().isAfter(LocalDateTime.now())){
                 List<ShopOrderGoods> orderGoodsList = shopOrderGoodsService.getListByOrderId(shopOrder.getOrderId());
-                if(!CollectionUtils.isEmpty(orderGoodsList)){
+                if(CollectionUtils.isNotEmpty(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);
+                    AtomicReference<BigDecimal> verifyParentMoney = 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())
+                                    .multiply(rate)
                                     .divide(BigDecimal.valueOf(100), 3, RoundingMode.HALF_UP); // 除100，保留2位小数
-
-                            // ✅ 原子更新（关键！）
                             verifyMoney.set(verifyMoney.get().add(money));
+
+                            //存在推广核验上级/指定人
+                            if(shopGood.getVerifyParentUserId() != null && shopGood.getVerifyParentRate().compareTo(BigDecimal.ZERO) > 0){
+                                BigDecimal parentMoney = orderGoods.getPrice()
+                                        .multiply(BigDecimal.valueOf(orderGoods.getTotalNum()))
+                                        .multiply(shopGood.getVerifyParentRate())
+                                        .multiply(rate)
+                                        .divide(BigDecimal.valueOf(100), 3, RoundingMode.HALF_UP); // 除100，保留2位小数
+                                verifyParentMoney.set(verifyParentMoney.get().add(parentMoney));
+
+                                shopOrder.setVerifyParentUser(shopGood.getVerifyParentUserId());
+                                shopOrder.setVerifyParentMoney(verifyMoney.get());
+                            }
                         }
                     });
                     shopOrder.setVerifyMoney(verifyMoney.get());
@@ -482,12 +587,27 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
                         if(!reduceBalance){
                             log.error("推广核销失败，结算推广佣金失败：" + reduceDto);
                         }
+                    }
 
+                    //结算推广核验上级/指定人佣金
+                    if(verifyParentMoney.get().compareTo(BigDecimal.ZERO) > 0){
+                        ShopDealerUserReduceDto reduceDto = new ShopDealerUserReduceDto();
+                        reduceDto.setTypeEnum(ShopDealerTypeEnum.WITHDRAW_ACCOUNT);
+                        reduceDto.setUserId(shopOrder.getVerifyParentUser());
+                        reduceDto.setOrderUserId(shopOrder.getUserId());
+                        reduceDto.setOrderNo(shopOrder.getOrderNo());
+                        reduceDto.setPrice(verifyParentMoney.get());
+                        reduceDto.setUpdateEnum(ShopDealerCapitalUpdateEnum.PROMOTION_PARENT_INCOME);
+
+                        Boolean reduceBalance = shopDealerUserService.reduceBalance(reduceDto);
+                        if(!reduceBalance){
+                            log.error("推广指定人核销失败，结算推广佣金失败：" + reduceDto);
+                        }
                     }
                 }
             }
 
-            //8.判断是否自提订单，如是自提订单需调整为订单完成，用户已收货状态
+            //9.判断是否自提订单，如是自提订单需调整为订单完成，用户已收货状态
             if(shopOrder.getOrderType() != null && shopOrder.getOrderType() == 2){
                 shopOrder.setOrderStatus(1);
                 shopOrder.setDeliveryStatus(20);
@@ -506,10 +626,15 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
             }
             return baseMapper.updateById(shopOrder) > 0;
         }catch (Exception e){
-            throw new RuntimeException("核销失败：" + e.getMessage());
+            throw new BusinessException("核销失败：" + e.getMessage());
         }
     }
 
+    @Override
+    public List<ShopOrderGoodsInfoVO> getOrderGoodsInfoByOrderNos(List<String> orderNoList) {
+        return baseMapper.getOrderGoodsInfoByOrderNos(orderNoList);
+    }
+
     private static Long getLong(Map<String, Object> raw, String key) {
         Object value = raw.get(key);
         if (value == null) {
@@ -651,11 +776,6 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
             throw new RuntimeException("订单金额为null");
         }
 
-        // 测试环境使用1分钱
-        if ("dev".equals(active)) {
-            money = 1;
-        }
-
         // 构建Native支付请求
         com.wechat.pay.java.service.payments.nativepay.model.PrepayRequest request =
             new com.wechat.pay.java.service.payments.nativepay.model.PrepayRequest();
@@ -710,13 +830,6 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
             }
         }
 
-        // 开发环境固定使用1分钱（与历史行为保持一致）
-        if ("dev".equals(active)) {
-            amount.setTotal(1);
-            request.setAmount(amount);
-            snapshot.setTotal(1);
-        }
-
         // 回调地址：优先用快照；若重入提示参数不一致，则尝试历史回调地址
         Exception last = null;
         String notifyUrlUsed = null;
@@ -851,13 +964,6 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
             }
         }
 
-        // 测试环境使用1分钱（快照优先）
-        if ("dev".equals(active)) {
-            amount.setTotal(1);
-            request.setAmount(amount);
-            snapshot.setTotal(1);
-        }
-
         Exception last = null;
         String notifyUrlUsed = null;
         for (String notifyUrl : buildNotifyUrlCandidates(order, payment, snapshot)) {
@@ -1243,7 +1349,7 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
 
             // 构建微信支付配置
             Config config = null;
-            if (active.equals("dev")) {
+            if (active.equals("local")) {
                 // 开发环境使用自动证书配置
                 // 首先初始化私钥路径
                 tenantCertPath = "dev/wechat/" + order.getTenantId();
@@ -1597,7 +1703,7 @@ public class ShopOrderServiceImpl extends ServiceImpl<ShopOrderMapper, ShopOrder
             String pubKey = null;
 
             // 初始化证书路径
-            if (active.equals("dev")) {
+            if (active.equals("local")) {
                 // 开发环境 - 构建包含租户号的证书路径
                 String tenantCertPath = "dev/wechat/" + order.getTenantId();
                 String privateKeyPath = tenantCertPath + "/" + certConfig.getWechatPay().getDev().getPrivateKeyFile();

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

@@ -0,0 +1,160 @@
+package com.gxwebsoft.shop.service.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.gxwebsoft.common.core.exception.BusinessException;
+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.common.system.mapper.UserMapper;
+import com.gxwebsoft.shop.mapper.ShopVerifyUserMapper;
+import com.gxwebsoft.shop.service.ShopVerifyUserService;
+import com.gxwebsoft.shop.entity.ShopVerifyUser;
+import com.gxwebsoft.shop.param.ShopVerifyUserParam;
+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;
+import java.util.stream.Collectors;
+
+/**
+ * 订单核销人管理Service实现
+ *
+ * @author xm
+ * @since 2026-05-25 17:00:03
+ */
+@Service
+@AllArgsConstructor
+public class ShopVerifyUserServiceImpl extends ServiceImpl<ShopVerifyUserMapper, ShopVerifyUser> implements ShopVerifyUserService {
+
+    private UserMapper userMapper;
+
+    @Override
+    public PageResult<ShopVerifyUser> pageRel(ShopVerifyUserParam param) {
+        PageParam<ShopVerifyUser, ShopVerifyUserParam> page = new PageParam<>(param);
+        page.setDefaultOrder("sort_number asc, create_time desc");
+        List<ShopVerifyUser> list = baseMapper.selectPageRel(page, param);
+        if(CollectionUtils.isNotEmpty(list)){
+            List<Integer> userIdList = list.stream().map(ShopVerifyUser::getUserId).distinct().collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(userIdList)){
+                List<User> userList = userMapper.selectByUserIdList(userIdList);
+
+                for(ShopVerifyUser verifyUser : list){
+                    User u = userList.stream().filter(user -> verifyUser.getUserId().equals(user.getUserId())).findFirst().orElse(null);
+                    if(u != null){
+                        verifyUser.setUserName(StrUtil.isNotEmpty(u.getRealName()) ? u.getRealName() : u.getNickname());
+                    }
+                }
+            }
+        }
+        return new PageResult<>(list, page.getTotal());
+    }
+
+    @Override
+    public List<ShopVerifyUser> listRel(ShopVerifyUserParam param) {
+        List<ShopVerifyUser> list = baseMapper.selectListRel(param);
+        if(CollectionUtils.isNotEmpty(list)){
+            List<Integer> userIdList = list.stream().map(ShopVerifyUser::getUserId).distinct().collect(Collectors.toList());
+            if(CollectionUtils.isNotEmpty(userIdList)){
+                List<User> userList = userMapper.selectByUserIdList(userIdList);
+
+                for(ShopVerifyUser verifyUser : list){
+                    User u = userList.stream().filter(user -> verifyUser.getUserId().equals(user.getUserId())).findFirst().orElse(null);
+                    if(u != null){
+                        verifyUser.setUserName(StrUtil.isNotEmpty(u.getRealName()) ? u.getRealName() : u.getNickname());
+                    }
+                }
+            }
+        }
+        // 排序
+        PageParam<ShopVerifyUser, ShopVerifyUserParam> page = new PageParam<>();
+        page.setDefaultOrder("sort_number asc, create_time desc");
+        return page.sortRecords(list);
+    }
+
+    @Override
+    public ShopVerifyUser getByIdRel(Integer id) {
+        ShopVerifyUserParam param = new ShopVerifyUserParam();
+        param.setId(id);
+        ShopVerifyUser verifyUser = param.getOne(baseMapper.selectListRel(param));
+        if(verifyUser != null){
+            User user = userMapper.getById(verifyUser.getUserId());
+            if(user != null){
+                verifyUser.setUserName(StrUtil.isNotEmpty(user.getRealName()) ? user.getRealName() : user.getNickname());
+            }
+        }
+        return verifyUser;
+    }
+
+    @Override
+    public ShopVerifyUser getInfo(Integer userId) {
+        List<ShopVerifyUser> list = lambdaQuery().eq(ShopVerifyUser::getUserId, userId).list();
+        if(CollectionUtils.isNotEmpty(list)){
+            return list.get(0);
+        }
+        return null;
+    }
+
+    @Override
+    public Boolean updateStatus(Integer id) {
+        ShopVerifyUser verifyUser = baseMapper.selectById(id);
+        if(verifyUser != null){
+            Integer status = verifyUser.getStatus();
+            if(status == 0){
+                verifyUser.setStatus(1);
+            }else {
+                verifyUser.setStatus(0);
+            }
+            verifyUser.setUpdateTime(LocalDateTime.now());
+            User loginUser = LoginUserUtil.getLoginUser();
+            verifyUser.setUpdater(loginUser != null ? loginUser.getUserId() : null);
+
+            return baseMapper.updateById(verifyUser) > 0;
+        }else {
+            throw new BusinessException(GlobalErrorCodeConstants.NOT_FOUND.getMsg());
+        }
+    }
+
+    @Override
+    public Boolean updateVerifyFlag(Integer id) {
+        ShopVerifyUser verifyUser = baseMapper.selectById(id);
+        if(verifyUser != null){
+            Integer verifyFlag = verifyUser.getVerifyFlag();
+            if(verifyFlag == 0){
+                verifyUser.setVerifyFlag(1);
+            }else {
+                verifyUser.setVerifyFlag(0);
+            }
+            verifyUser.setUpdateTime(LocalDateTime.now());
+            User loginUser = LoginUserUtil.getLoginUser();
+            verifyUser.setUpdater(loginUser != null ? loginUser.getUserId() : null);
+
+            return baseMapper.updateById(verifyUser) > 0;
+        }else {
+            throw new BusinessException(GlobalErrorCodeConstants.NOT_FOUND.getMsg());
+        }
+    }
+
+    @Override
+    public Boolean saveInfo(ShopVerifyUser shopVerifyUser) {
+        Integer userId = shopVerifyUser.getUserId();
+        if(userId == null){
+            throw new BusinessException("用户ID必传！");
+        }
+
+        List<ShopVerifyUser> list = lambdaQuery().eq(ShopVerifyUser::getUserId, userId).list();
+        if(CollectionUtils.isNotEmpty(list)){
+            throw new BusinessException("该用户已存在核销人关系!");
+        }
+        User loginUser = LoginUserUtil.getLoginUser();
+        shopVerifyUser.setCreator(loginUser != null ? loginUser.getUserId() : null);
+        shopVerifyUser.setCreateTime(LocalDateTime.now());
+
+        return baseMapper.insert(shopVerifyUser) > 0;
+    }
+
+}

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

@@ -28,7 +28,7 @@ public class CouponExpireTask {
      * 生产环境：每天凌晨2点执行
      * 开发环境：每10分钟执行一次（用于测试）
      */
-    @Scheduled(cron = "${coupon.expire.cron:0 0 2 * * ?}")
+//    @Scheduled(cron = "${coupon.expire.cron:0 0 2 * * ?}")
     public void processExpiredCoupons() {
         log.info("开始执行过期优惠券处理任务...");
         
@@ -44,7 +44,7 @@ public class CouponExpireTask {
             log.info("过期优惠券处理任务完成，更新数量: {}，耗时: {}ms", updatedCount, duration);
             
             // 如果是开发环境，输出更详细的日志
-            if ("dev".equals(activeProfile)) {
+            if ("local".equals(activeProfile)) {
                 log.debug("开发环境 - 过期优惠券处理详情: 更新{}张优惠券", updatedCount);
             }
             
@@ -57,7 +57,7 @@ public class CouponExpireTask {
      * 每小时执行一次优惠券状态检查（可选）
      * 用于及时发现和处理刚过期的优惠券
      */
-    @Scheduled(cron = "0 0 * * * ?")
+//    @Scheduled(cron = "0 0 * * * ?")
     public void hourlyExpiredCouponsCheck() {
         // 只在生产环境执行
         if (!"prod".equals(activeProfile)) {

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

@@ -67,7 +67,7 @@ public class OrderAutoCancelTask {
                     totalCancelledCount, defaultCancelledCount, tenantCancelledCount, duration);
 
             // 开发环境输出更详细的日志
-            if ("dev".equals(activeProfile)) {
+            if ("local".equals(activeProfile)) {
                 log.debug("开发环境 - 订单自动取消详情: 总共取消{}个订单", totalCancelledCount);
             }
 

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

@@ -0,0 +1,168 @@
+package com.gxwebsoft.shop.task;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.gxwebsoft.common.core.annotation.IgnoreTenant;
+import com.gxwebsoft.common.core.enums.ShopDealerCapitalUpdateEnum;
+import com.gxwebsoft.common.core.enums.ShopDealerTypeEnum;
+import com.gxwebsoft.common.system.redis.OrderNoUtils;
+import com.gxwebsoft.shop.dto.ShopDealerSettlementDto;
+import com.gxwebsoft.shop.dto.ShopDealerSettlementItemDto;
+import com.gxwebsoft.shop.entity.ShopDealerOrder;
+import com.gxwebsoft.shop.entity.ShopOrder;
+import com.gxwebsoft.shop.mapper.ShopDealerOrderMapper;
+import com.gxwebsoft.shop.mapper.ShopOrderMapper;
+import com.gxwebsoft.shop.service.ShopDealerOrderService;
+import com.gxwebsoft.shop.service.ShopDealerUserService;
+import com.gxwebsoft.shop.service.ShopOrderService;
+import com.gxwebsoft.shop.vo.ShopDealerOrderTaskVO;
+import lombok.AllArgsConstructor;
+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 java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 订单结算任务【门店/服务商结算、总分红结算等】
+ * @author xm
+ * @since 2026-05-15
+ */
+@Slf4j
+@Component
+@AllArgsConstructor
+public class OrderSettlementTask {
+
+    private ShopDealerOrderMapper shopDealerOrderMapper;
+
+    private ShopDealerOrderService shopDealerOrderService;
+
+    private ShopOrderMapper shopOrderMapper;
+
+    private ShopOrderService shopOrderService;
+
+    private ShopDealerUserService shopDealerUserService;
+
+    private OrderNoUtils orderNoUtils;
+
+    /**
+     * 门店、服务商结算任务：每天一点，每10分钟执行一次结算任务
+     */
+    @Scheduled(cron = "0 0/10 1 * * ?")
+    @IgnoreTenant("定时门店、服务商结算任务")
+    @Transactional
+    public void teamSettlement(){
+        //1.查询待结算订单信息
+        List<ShopDealerOrderTaskVO> orderTaskVOList = shopDealerOrderMapper.getDealerOrderList(10584);
+        if(CollectionUtils.isNotEmpty(orderTaskVOList)){
+            LocalDateTime now = LocalDateTime.now();
+            List<Integer> orderIdList = orderTaskVOList.stream().map(ShopDealerOrderTaskVO::getOrderId).distinct().collect(Collectors.toList());
+            List<Integer> shopDealerIdList = orderTaskVOList.stream().map(ShopDealerOrderTaskVO::getShopDealerOrderId).distinct().collect(Collectors.toList());
+
+            //2.查询商品订单信息
+            List<ShopOrder> shopOrderList = shopOrderMapper.selectList(new LambdaQueryWrapper<ShopOrder>().select(ShopOrder::getOrderId, ShopOrder::getTeamSettlementFlag)
+                    .in(ShopOrder::getOrderId, orderIdList));
+
+            //3.查询商品订单分销信息
+            List<ShopDealerOrder> shopDealerOrderList = shopDealerOrderMapper.selectList(new LambdaQueryWrapper<ShopDealerOrder>().select(ShopDealerOrder::getId, ShopDealerOrder::getOrderNo)
+                    .in(ShopDealerOrder::getId, shopDealerIdList));
+
+            //4.结算一级服务商佣金
+            Map<Integer, List<ShopDealerOrderTaskVO>> firstDealerMap = orderTaskVOList.stream().collect(Collectors.groupingBy(ShopDealerOrderTaskVO::getFirstDividendUser));
+            List<ShopDealerSettlementItemDto> firstSettlementItemDtoList = new ArrayList<>();
+            firstDealerMap.forEach((k, value) ->{
+                List<Integer> orderIds = value.stream().map(ShopDealerOrderTaskVO::getOrderId).distinct().collect(Collectors.toList());
+                List<Integer> shopDealerOrderIds = value.stream().map(ShopDealerOrderTaskVO::getShopDealerOrderId).distinct().collect(Collectors.toList());
+
+                //4.1 标记商品订单为已结算状态
+                List<ShopOrder> shopOrders = shopOrderList.stream().filter(shopOrder -> orderIds.contains(shopOrder.getOrderId())).collect(Collectors.toList());
+                shopOrders.forEach(shopOrder -> shopOrder.setTeamSettlementFlag(1));
+
+                //4.2 生成分销记录【增加钱包金额】
+                BigDecimal firstDividendSum = value.stream().map(ShopDealerOrderTaskVO::getFirstDividend).reduce(BigDecimal.ZERO, BigDecimal::add);
+                ShopDealerSettlementItemDto itemDto = new ShopDealerSettlementItemDto();
+                String no = orderNoUtils.generate("C");
+                itemDto.setNo(no);
+                itemDto.setUserId(k);
+                itemDto.setMoney(firstDividendSum);
+                firstSettlementItemDtoList.add(itemDto);
+
+                //4.3更新商品分销记录对应的一级服务商佣金为已结算状态
+                List<ShopDealerOrder> shopDealerOrders = shopDealerOrderList.stream().filter(shopDealerOrder -> shopDealerOrderIds.contains(shopDealerOrder.getId())).collect(Collectors.toList());
+                shopDealerOrders.forEach(shopDealerOrder -> {
+                    shopDealerOrder.setFirstDividendFlag(1);
+                    shopDealerOrder.setFirstDividendNo(no);
+                    shopDealerOrder.setFirstDividendTime(now);
+                });
+            });
+
+            //4.4 一级结算【增加钱包金额】
+            if(CollectionUtils.isNotEmpty(firstSettlementItemDtoList)){
+                ShopDealerSettlementDto firstSettlementDto = new ShopDealerSettlementDto();
+                firstSettlementDto.setType(ShopDealerTypeEnum.WITHDRAW_ACCOUNT.getCode());
+                firstSettlementDto.setFlowType(ShopDealerCapitalUpdateEnum.MANAGEMENT_INCOME.getType());
+                firstSettlementDto.setComments("团队管理津贴(1)");
+                firstSettlementDto.setTenantId(10584);
+                firstSettlementDto.setItemList(firstSettlementItemDtoList);
+                shopDealerUserService.settlementBatch(firstSettlementDto);
+            }
+
+            //5.结算二级服务商佣金
+            Map<Integer, List<ShopDealerOrderTaskVO>> secondDealerMap = orderTaskVOList.stream().collect(Collectors.groupingBy(ShopDealerOrderTaskVO::getSecondDividendUser));
+            List<ShopDealerSettlementItemDto> secondSettlementItemDtoList = new ArrayList<>();
+            secondDealerMap.forEach((k, value) ->{
+                List<Integer> orderIds = value.stream().map(ShopDealerOrderTaskVO::getOrderId).distinct().collect(Collectors.toList());
+                List<Integer> shopDealerOrderIds = value.stream().map(ShopDealerOrderTaskVO::getShopDealerOrderId).distinct().collect(Collectors.toList());
+
+                //5.1 标记商品订单为已结算状态
+                List<ShopOrder> shopOrders = shopOrderList.stream().filter(shopOrder -> orderIds.contains(shopOrder.getOrderId())).collect(Collectors.toList());
+                shopOrders.forEach(shopOrder -> shopOrder.setTeamSettlementFlag(1));
+
+                //5.2 生成分销记录【增加钱包金额】
+                BigDecimal secondDividendSum = value.stream().map(ShopDealerOrderTaskVO::getSecondDividend).reduce(BigDecimal.ZERO, BigDecimal::add);
+                ShopDealerSettlementItemDto itemDto = new ShopDealerSettlementItemDto();
+                String no = orderNoUtils.generate("C");
+                itemDto.setNo(no);
+                itemDto.setUserId(k);
+                itemDto.setMoney(secondDividendSum);
+                secondSettlementItemDtoList.add(itemDto);
+
+                //5.3 更新商品分销记录对应的一级服务商佣金为已结算状态
+                List<ShopDealerOrder> shopDealerOrders = shopDealerOrderList.stream().filter(shopDealerOrder -> shopDealerOrderIds.contains(shopDealerOrder.getId())).collect(Collectors.toList());
+                shopDealerOrders.forEach(shopDealerOrder -> {
+                    shopDealerOrder.setSecondDividendFlag(1);
+                    shopDealerOrder.setSecondDividendNo(no);
+                    shopDealerOrder.setSecondDividendTime(now);
+                });
+            });
+
+            //5.4 二级结算【增加钱包金额】
+            if(CollectionUtils.isNotEmpty(secondSettlementItemDtoList)){
+                ShopDealerSettlementDto secondSettlementDto = new ShopDealerSettlementDto();
+                secondSettlementDto.setType(ShopDealerTypeEnum.WITHDRAW_ACCOUNT.getCode());
+                secondSettlementDto.setFlowType(ShopDealerCapitalUpdateEnum.MANAGEMENT_INCOME.getType());
+                secondSettlementDto.setComments("团队管理津贴(2)");
+                secondSettlementDto.setTenantId(10584);
+                secondSettlementDto.setItemList(secondSettlementItemDtoList);
+                shopDealerUserService.settlementBatch(secondSettlementDto);
+            }
+
+            //6.批量修改订单为已结算状态
+            if(CollectionUtils.isNotEmpty(shopOrderList)){
+                shopOrderService.updateBatchById(shopOrderList);
+            }
+
+            //7.批量修改订单分销数据为已结算状态
+            if(CollectionUtils.isNotEmpty(shopDealerOrderList)){
+                shopDealerOrderService.updateBatchById(shopDealerOrderList);
+            }
+        }
+    }
+
+}

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

@@ -0,0 +1,45 @@
+package com.gxwebsoft.shop.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 查询个人流水
+ *
+ */
+@Data
+@Schema(name = "ShopDealerCapitalWaterVO", description = "查询个人流水")
+public class ShopDealerCapitalWaterVO {
+
+    @Schema(description = "订单编号")
+    private String no;
+
+    @Schema(description = "关联订单编号")
+    private String orderNo;
+
+    @Schema(description = "资金流动类型 (10分销收入 11团队管理津贴收入 12分红收入 13现场推广收入 14现场推广分佣 20提现支出 30转账支出 40转账收入 50佣金解冻 60配送奖励 61配送提成 62配送步梯费 70佣金退回【退单】)")
+    private Integer flowType;
+
+    @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;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+}
+

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

@@ -0,0 +1,45 @@
+package com.gxwebsoft.shop.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * 订单分销门店/服务商分佣记录
+ * @author xm
+ * @since 2026-05-15
+ */
+@Data
+@Schema(description = "订单分销门店/服务商分佣记录")
+public class ShopDealerOrderTaskVO {
+
+    @Schema(description = "商品订单ID")
+    private Integer orderId;
+
+    @Schema(description = "主键ID")
+    private Integer shopDealerOrderId;
+
+    @Excel(name = "订单编号")
+    private String orderNo;
+
+    @Schema(description = "一级服务商/门店")
+    private Integer firstDividendUser;
+
+    @Schema(description = "一级服务商/门店管理津贴")
+    private BigDecimal firstDividend;
+
+    @Schema(description = "一级服务商/门店结算标识 0-否 1-是")
+    private Integer firstDividendFlag;
+
+    @Schema(description = "二级服务商/门店")
+    private Integer secondDividendUser;
+
+    @Schema(description = "二级服务商/门店管理津贴")
+    private BigDecimal secondDividend;
+
+    @Schema(description = "二级服务商/门店结算标识 0-否 1-是")
+    private Integer secondDividendFlag;
+
+}

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

@@ -0,0 +1,48 @@
+package com.gxwebsoft.shop.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ *
+ * @author xm
+ * @since 2026-05-19
+ */
+@Data
+@Schema(description = "两级推荐人数据")
+public class ShopDealerOrderTodayRevenueVO {
+
+    @Schema(name = "订单编号")
+    private String orderNo;
+
+    @Schema(description = "分销商用户id(一级)")
+    private Integer firstUserId;
+
+    @Schema(description = "分销佣金(一级)")
+    private BigDecimal firstMoney;
+
+    @Schema(description = "分销商用户id(二级)")
+    private Integer secondUserId;
+
+    @Schema(description = "分销佣金(二级)")
+    private BigDecimal secondMoney;
+
+    @Schema(description = "一级服务商/门店")
+    private Integer firstDividendUser;
+
+    @Schema(description = "一级服务商/门店管理津贴")
+    private BigDecimal firstDividend;
+
+    @Schema(description = "二级服务商/门店")
+    private Integer secondDividendUser;
+
+    @Schema(description = "二级服务商/门店管理津贴")
+    private BigDecimal secondDividend;
+
+    @Excel(name = "0未使用，1已完成，2已取消，3取消中，4退款申请中，5退款被拒绝，6退款成功，7客户端申请退款")
+    private Integer orderStatus;
+
+}

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

@@ -74,6 +74,9 @@ public class ShopFlashSaleActivityVO implements Serializable {
     @Schema(description = "排序")
     private Integer sortNumber;
 
+    @Schema(description = "是否弹窗 0-否 1-是")
+    private Integer popFlag;
+
     @Schema(description = "租户id")
     private Integer tenantId;