当面付进件修改

Merge remote-tracking branch 'origin/pay' into pay
查询
2026-01-08 18:18:27 +08:00 · 2026-01-08 17:01:47 +08:00 · 2026-01-08 17:01:36 +08:00 · 2026-01-08 16:59:41 +08:00
62 changed files with 1288 additions and 1311 deletions
--- a/cash-api/account-server/src/main/java/com/czg/controller/TestController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/TestController.java
@@ -0,0 +1,39 @@
+package com.czg.controller;
+
+import com.czg.account.entity.ShopUser;
+import com.czg.account.service.ShopInfoService;
+import com.czg.account.service.ShopUserFlowService;
+import com.czg.account.service.ShopUserService;
+import com.czg.account.service.TestService;
+import jakarta.annotation.Resource;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author GYJoker
+ */
+@RestController
+@RequestMapping("/notify/test")
+public class TestController {
+    @Resource
+    private ShopUserFlowService shopUserFlowService;
+    @Resource
+    private ShopInfoService shopInfoService;
+    @Resource
+    private ShopUserService shopUserService;
+    @Resource
+    private TestService testService;
+
+    @RequestMapping("/hello")
+    public String hello() {
+        shopUserFlowService.list().forEach(item -> {
+            ShopUser shopUserInfo = shopUserService.getShopUserInfo(item.getShopId(), item.getUserId());
+            if (shopUserInfo != null) {
+                item.setShopUserId(shopUserInfo.getId());
+                shopUserFlowService.updateById(item);
+            }
+        });
+//        return testService.insertData();
+        return "";
+    }
+}
--- a/cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/MenuController.java
@@ -4,18 +4,14 @@ import com.czg.account.dto.menu.MenuAddDTO;
 import com.czg.account.dto.menu.MenuDelDTO;
 import com.czg.account.dto.menu.MenuEditDTO;
 import com.czg.account.entity.CashMenu;
-import com.czg.account.entity.QuickMenu;
 import com.czg.account.entity.SysMenu;
-import com.czg.account.service.QuickMenuService;
 import com.czg.account.service.SysMenuService;
 import com.czg.account.vo.MenuVO;
 import com.czg.annotation.SaAdminCheckPermission;
 import com.czg.annotation.SaAdminCheckRole;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
-import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.annotation.Resource;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

@@ -23,7 +19,6 @@ import java.util.List;

 /**
 * 菜单管理
- *
 * @author zs
 */
@RestController
@@ -32,12 +27,9 @@ public class MenuController {

    @Resource
    private SysMenuService menuService;
-    @Resource
-    private QuickMenuService quickMenuService;

    /**
     * 获取当前用户菜单列表
-     *
     * @return 菜单结构
     */
    @GetMapping
@@ -48,7 +40,6 @@ public class MenuController {

    /**
     * 收银机菜单
-     *
     * @return 所有菜单
     */
    @GetMapping("/list/cash")
@@ -58,7 +49,6 @@ public class MenuController {

    /**
     * 获取所有菜单
-     *
     * @return 菜单结构
     */
    @SaAdminCheckPermission(parentName = "菜单管理", value = "menu:list", name = "菜单列表")
@@ -72,7 +62,6 @@ public class MenuController {

    /**
     * 菜单详情
-     *
     * @return 菜单结构
     */
    @SaAdminCheckRole("管理员")
@@ -84,7 +73,6 @@ public class MenuController {

    /**
     * 菜单添加
-     *
     * @return 是否成功
     */
    @SaAdminCheckRole("管理员")
@@ -96,7 +84,6 @@ public class MenuController {

    /**
     * 菜单修改
-     *
     * @return 是否成功
     */
    @SaAdminCheckRole("管理员")
@@ -108,15 +95,12 @@ public class MenuController {

    /**
     * 菜单删除
-     *
     * @return 是否成功
     */
    @SaAdminCheckRole("管理员")
    @SaAdminCheckPermission(parentName = "菜单管理", value = "menu:del", name = "菜单删除")
    @DeleteMapping()
-    @Transactional
    public CzgResult<Boolean> edit(@RequestBody @Validated MenuDelDTO menuDelDTO) {
-        quickMenuService.remove(QueryWrapper.create().eq(QuickMenu::getMenuId, menuDelDTO.getId()));
        return CzgResult.success(menuService.removeById(menuDelDTO.getId()));
    }

--- a/cash-api/account-server/src/main/java/com/czg/controller/admin/QuickMenuController.java
+++ b/cash-api/account-server/src/main/java/com/czg/controller/admin/QuickMenuController.java
@@ -1,70 +0,0 @@
-package com.czg.controller.admin;
-
-import cn.hutool.core.collection.CollUtil;
-import com.czg.account.entity.QuickMenu;
-import com.czg.account.service.QuickMenuService;
-import com.czg.annotation.SaAdminCheckPermission;
-import com.czg.resp.CzgResult;
-import com.czg.sa.StpKit;
-import com.mybatisflex.core.query.QueryWrapper;
-import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
-import java.util.Set;
-
-/**
- * 悬浮窗/快捷菜单
- *
- * @author ww
- * @description
- */
-@RestController
-@RequestMapping("/admin/quick")
-@Slf4j
-public class QuickMenuController {
-
-    @Resource
-    private QuickMenuService quickMenuService;
-
-    @SaAdminCheckPermission(parentName = "悬浮窗", value = "quick:list", name = "悬浮窗-列表")
-    @GetMapping
-    public CzgResult<List<QuickMenu>> getQuickList(@RequestParam(required = false) Integer status,
-                                                   @RequestParam(required = false, defaultValue = "0") Integer isEdit) {
-        List<QuickMenu> list = quickMenuService.list(QueryWrapper.create()
-                .eq(QuickMenu::getShopId, StpKit.USER.getShopId())
-                .eq(QuickMenu::getStatus, status)
-                .orderBy(QuickMenu::getSort, true));
-        if (isEdit.equals(0)) {
-            if (CollUtil.isEmpty(list)) {
-                list = quickMenuService.list(QueryWrapper.create()
-                        .eq(QuickMenu::getShopId, 1)
-                        .eq(QuickMenu::getStatus, status)
-                        .orderBy(QuickMenu::getSort, true));
-            }
-        }
-        return CzgResult.success(list);
-    }
-
-    @SaAdminCheckPermission(parentName = "悬浮窗", value = "quick:list", name = "悬浮窗-新增")
-    @PostMapping
-    public CzgResult<Boolean> saveQuick(@RequestBody @Validated QuickMenu quickMenu) {
-        quickMenu.setShopId(StpKit.USER.getShopId());
-        return CzgResult.success(quickMenuService.save(quickMenu));
-    }
-
-    @SaAdminCheckPermission(parentName = "悬浮窗", value = "quick:list", name = "悬浮窗-修改")
-    @PutMapping
-    public CzgResult<Boolean> updateQuick(@RequestBody @Validated QuickMenu quickMenu) {
-        return CzgResult.success(quickMenuService.update(quickMenu, QueryWrapper.create()
-                .eq(QuickMenu::getId, quickMenu.getId()).eq(QuickMenu::getShopId, StpKit.USER.getShopId())));
-    }
-
-    @SaAdminCheckPermission(parentName = "悬浮窗", value = "quick:list", name = "悬浮窗-删除")
-    @DeleteMapping
-    public CzgResult<Boolean> deleteQuick(@RequestBody Set<Long> ids) {
-        return CzgResult.success(quickMenuService.remove(QueryWrapper.create().in(QuickMenu::getId, ids).eq(QuickMenu::getShopId, StpKit.USER.getShopId())));
-    }
-}
--- a/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java
+++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java
@@ -13,7 +13,6 @@ import com.czg.market.vo.InviteUserVO;
 import com.czg.market.vo.MkDistributionConfigVO;
 import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
-import com.czg.task.DistributionTask;
 import com.czg.utils.AssertUtil;
 import com.mybatisflex.core.paginate.Page;
 import jakarta.annotation.Resource;
@@ -38,22 +37,6 @@ public class UDistributionController {
    private MkDistributionWithdrawFlowService withdrawFlowService;
    @Resource
    private MkDistributionFlowService distributionFlowService;
-    @Resource
-    private DistributionTask distributionTask;
-
-    /**
-     * 分销员中心-获取配置
-     */
-    @GetMapping("/task")
-    public CzgResult<String> task(@RequestParam Long shopId) {
-        try {
-            distributionTask.deliver(shopId);
-        } catch (Exception e) {
-            return CzgResult.failure(e.getMessage());
-        }
-        return CzgResult.success("任务执行成功");
-    }
-

    /**
     * 分销员中心-获取配置
--- a/cash-api/market-server/src/main/java/com/czg/task/AAMarketTasks.java
+++ b/cash-api/market-server/src/main/java/com/czg/task/AAMarketTasks.java
@@ -6,7 +6,6 @@ import org.springframework.stereotype.Component;

 /**
 * market服务 任务总调度
- *
 * @author ww
 */
@Component
@@ -19,9 +18,9 @@ public class AAMarketTasks {


    // 分销延时发放
-    @Scheduled(cron = "0 0 0/2 * * ? ")
+    @Scheduled(fixedRate = 30000)
    public void distributionTask() {
-        distributionTask.deliver(null);
+        distributionTask.deliver();
    }


@@ -30,7 +29,6 @@ public class AAMarketTasks {
    public void birthdayGiftTask() {
        birthdayGiftTask.deliver();
    }
-
    //会员生日弹窗提醒重置 每年1月1日
    @Scheduled(cron = "0 0 0 1 1 ?")
    public void birthdayGiftRemindTask() {
@@ -41,7 +39,6 @@ public class AAMarketTasks {
    //优惠券 过期
    @Resource
    private CouponTask couponTask;
-
    //每天每小时的30分 0秒 执行
    @Scheduled(cron = "0 30 * * * ? ")
    public void couponTask() {
@@ -51,7 +48,6 @@ public class AAMarketTasks {
    //会员奖励发放
    @Resource
    private MemberTask memberTask;
-
    //每天1点 0分 0秒 执行
    @Scheduled(cron = "0 0 1 * * ? ")
    public void memberTask() {
@@ -61,7 +57,6 @@ public class AAMarketTasks {
    //满减活动/限时折扣 处理任务状态  定时任务
    @Resource
    private ActivityStatusTask activityStatusTask;
-
    //每天0点 0分 1秒 执行
    @Scheduled(cron = "1 0 0 * * ? ")
    public void activityStatusTask() {
@@ -72,7 +67,6 @@ public class AAMarketTasks {
    //月累计 发送条数 累计金额
    @Resource
    private SmsShopMoneyTask smsShopMoneyTask;
-
    //每月1号 0点 0分 1秒 执行
    @Scheduled(cron = "1 0 0 1 * ?")
    public void smsShopMoneyTask() {
--- a/cash-api/market-server/src/main/java/com/czg/task/DistributionTask.java
+++ b/cash-api/market-server/src/main/java/com/czg/task/DistributionTask.java
@@ -1,17 +1,18 @@
 package com.czg.task;

 import cn.hutool.core.collection.CollUtil;
-import com.czg.account.entity.ShopInfo;
+import cn.hutool.core.date.DateUtil;
+import com.czg.account.entity.ShopUser;
 import com.czg.account.service.ShopInfoService;
+import com.czg.account.service.ShopUserService;
 import com.czg.constant.TableValueConstant;
-import com.czg.constants.SystemConstants;
-import com.czg.exception.CzgException;
 import com.czg.market.entity.MkDistributionFlow;
 import com.czg.market.service.MkDistributionFlowService;
 import com.czg.market.service.MkDistributionUserService;
 import com.czg.market.service.OrderInfoService;
 import com.czg.order.entity.OrderInfo;
 import com.czg.service.market.enums.OrderStatusEnums;
+import com.czg.utils.FunUtils;
 import com.mybatisflex.core.query.QueryWrapper;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -39,6 +40,8 @@ public class DistributionTask {
    private OrderInfoService orderInfoService;
    @DubboReference
    private ShopInfoService shopInfoService;
+    @DubboReference
+    private ShopUserService shopUserService;

    List<String> list = List.of(OrderStatusEnums.REFUND.getCode(), OrderStatusEnums.PART_REFUND.getCode());

@@ -48,55 +51,44 @@ public class DistributionTask {
     */
 //    @Scheduled(cron = "0 0 0 * * ?")
 //    @Scheduled(fixedRate = 30000)
-    public void deliver(Long shopId) {
-        LocalDateTime now = LocalDateTime.now();
-        List<ShopInfo> shopInfos = shopInfoService.list(QueryWrapper.create()
-                .eq(ShopInfo::getIsDeleted, SystemConstants.OneZero.ZERO)
-                .isNotNull(ShopInfo::getExpireTime)
-                .lt(ShopInfo::getExpireTime, now)
-                .gt(ShopInfo::getAmount, BigDecimal.ZERO)
-                .eq(ShopInfo::getId, shopId)
-        );
-        if (CollUtil.isEmpty(shopInfos)) {
-            log.info("分销延时分账 无符合条件的店铺，无需处理分账");
-            return;
-        }
-        for (ShopInfo shopInfo : shopInfos) {
-            boolean breakCurrentShopFlow = false;
-            List<MkDistributionFlow> flowList = distributionFlowService.list(new QueryWrapper()
-                    .eq(MkDistributionFlow::getShopId, shopInfo.getId())
-                    .eq(MkDistributionFlow::getStatus, TableValueConstant.DistributionFlow.Status.PENDING.getCode())
-                    .le(MkDistributionFlow::getDeliverTime, now)
-                    .orderBy(MkDistributionFlow::getId, true)
-            );
-            for (MkDistributionFlow item : flowList) {
-                if (breakCurrentShopFlow) {
-                    break;
-                }
-                try {
-                    log.info("分销延时分账， id: {}, orderNo: {}, 类型: {}", item.getId(), item.getOrderNo(), item.getType());
+    public void deliver() {
+        //  1. 订单完成支付时（判断是否分销）产生流水记录。
+        //  2. 判断入账时间。
+        //  3. 如果是 0 天，再去判断商户余额是否足够。够则入账，不足则不管。
+        //  4. 流水增加应该入账的时间（订单产生时带入）
+        //  5. 定时任务 应该是一天执行一次。查询待入账状态和应入账时间小于当前时间的记录，循环处理：并且判断商户余额是否足够，余额不足忽略处理；余额足够变为已入账并扣除商户余额。
+        //  6. 订单产生退款时，去流水表查询该订单的流水记录，如果未入账改为已入账，并插入一条退款扣钱的流水。
+
+        // shopInfo 查余额>0
+        // 循环 shopId 查询 如果金额不足 终止
+        //
+        LocalDateTime localDateTime = DateUtil.date().toLocalDateTime();
+        distributionFlowService.list(new QueryWrapper()
+                .eq(MkDistributionFlow::getStatus, TableValueConstant.DistributionFlow.Status.PENDING.getCode()).le(MkDistributionFlow::getDeliverTime, localDateTime)).forEach(item -> {
+            FunUtils.safeRunVoid(() -> {
+                log.info("开始处理延时分账， id: {}, orderNo: {}, 类型: {}", item.getId(), item.getOrderNo(), item.getType());
+
                OrderInfo orderInfo = orderInfoService.getOne(new QueryWrapper().eq(OrderInfo::getOrderNo, item.getOrderNo()));
                if (orderInfo == null) {
                    item.setStatus(TableValueConstant.DistributionFlow.Status.FAIL.getCode());
                    distributionFlowService.updateById(item);
-                        log.warn("分销延时分账。订单不存在, 订单号: {}", item.getOrderNo());
-                        continue;
+                    log.warn("订单不存在, 订单号: {}", item.getOrderNo());
+                    return;
                }
                if (list.contains(orderInfo.getStatus())) {
-                        log.warn("分销延时分账。订单已退款, 订单号: {}", item.getOrderNo());
+                    log.warn("订单已退款, 订单号: {}", item.getOrderNo());
                    distributionUserService.refund(orderInfo.getId(), orderInfo.getOrderNo());
                } else {
                    item.setStatus(TableValueConstant.DistributionFlow.Status.SUCCESS.getCode());
-                        distributionUserService.distributionUserAmount(item, orderInfo);
-                    }
-                } catch (CzgException e) {
-                    log.error("店铺{}:{}分销延时分账异常:{}", shopInfo.getId(), shopInfo.getShopName(), e.getMessage());
-                    breakCurrentShopFlow = true;
-                } catch (Exception e) {
-                    log.error("店铺{}:{}分销延时分账异常", shopInfo.getId(), shopInfo.getShopName(), e);
-                    breakCurrentShopFlow = true;
-                }
-            }
+                    ShopUser shopUser = shopUserService.getById(item.getDistributionUserId());
+                    distributionUserService.updateShopInfoAmount(orderInfo.getShopId(), item.getRewardAmount().negate(), orderInfo.getId(), TableValueConstant.DistributionAmountFlow.Type.SUB, "分销扣减");
+                    distributionUserService.updateIncome(item.getRewardAmount().negate(), item.getRewardAmount(), BigDecimal.ZERO,
+                            item.getDistributionUserId(), shopUser.getUserId(), item.getShopUserId(), item.getShopId(), item.getLevel());
+                    distributionFlowService.updateById(item);
                }
+            });
+        });
    }
+
+
 }
--- a/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java
@@ -50,8 +50,6 @@ public class NotifyController {
    @Resource
    private MkShopConsumeDiscountRecordService consumeDiscountRecordService;

-
-    //新客立减清除数据 测试用
    @RequestMapping("clear")
    public String clear(@RequestParam Integer shopId) {
        consumeDiscountRecordService.remove(new QueryWrapper().eq(MkShopConsumeDiscountRecord::getShopId, shopId));
--- a/cash-api/order-server/src/main/java/com/czg/controller/StatisticTaskController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/StatisticTaskController.java
@@ -21,7 +21,7 @@ public class StatisticTaskController {
    private StatisticTask statisticTask;

    /**
-     * 基础统计 预留重置统计
+     * 基础统计
     *
     * @param date 日期yyyy-MM-dd
     */
--- a/cash-api/order-server/src/main/java/com/czg/controller/pay/DistributionPayController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/pay/DistributionPayController.java
@@ -4,15 +4,14 @@ import com.czg.annotation.Debounce;
 import com.czg.order.dto.MkDistributionPayDTO;
 import com.czg.resp.CzgResult;
 import com.czg.service.order.service.DistributionPayService;
+import com.czg.system.service.SysParamsService;
 import com.czg.utils.AssertUtil;
 import com.czg.utils.ServletUtil;
 import jakarta.annotation.Resource;
 import jakarta.servlet.http.HttpServletRequest;
+import org.apache.dubbo.config.annotation.DubboReference;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;

 import java.util.Map;

@@ -27,6 +26,16 @@ import java.util.Map;
 public class DistributionPayController {
    @Resource
    private DistributionPayService payService;
+    @DubboReference
+    private SysParamsService paramsService;
+
+
+//    @PostMapping("/cashPay")
+//    @Debounce(value = "#payParam.checkOrderPay.orderId")
+//    public CzgResult<Object> cashPayOrder(@RequestHeader Long shopId, @Validated @RequestBody MkDistributionPayDTO payParam) {
+//        payParam.setShopId(shopId);
+//        return payService.cashPayOrder(payParam);
+//    }

    /**
     * 小程序支付
@@ -50,4 +59,26 @@ public class DistributionPayController {
        AssertUtil.isBlank(payParam.getCode(), "微信code不为空");
        return CzgResult.success(payService.mchRecharge(ServletUtil.getClientIP(request), payParam));
    }
+//
+//    /**
+//     * 正扫
+//     */
+//    @PostMapping("/scanPay")
+//    @Debounce(value = "#payParam.checkOrderPay.orderId")
+//    public CzgResult<Map<String, Object>> scanPayOrder(@RequestHeader Long shopId, HttpServletRequest request, @Validated @RequestBody MkDistributionPayDTO payParam) {
+//        payParam.setShopId(shopId);
+//        return payService.scanPayOrder(ServletUtil.getClientIP(request), payParam);
+//    }
+//
+//    /**
+//     * 反扫
+//     * authCode 必填 扫描码
+//     */
+//    @PostMapping("/microPay")
+//    @Debounce(value = "#payParam.checkOrderPay.orderId")
+//    public CzgResult<Map<String, Object>> microPayOrder(@RequestHeader Long shopId, @Validated @RequestBody MkDistributionPayDTO payParam) {
+//        payParam.setShopId(shopId);
+//        return payService.microPayOrder(payParam);
+//    }
+
 }
--- a/cash-api/order-server/src/main/java/com/czg/mq/OrderMqListener.java
+++ b/cash-api/order-server/src/main/java/com/czg/mq/OrderMqListener.java
@@ -9,7 +9,7 @@ import com.czg.order.entity.MqLog;
 import com.czg.order.service.MqLogService;
 import com.czg.order.service.OrderInfoCustomService;
 import com.czg.order.service.OrderInfoRpcService;
-import com.czg.service.RedisService;
+import com.czg.service.order.utils.FunUtil;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.rabbit.annotation.RabbitListener;
@@ -31,7 +31,7 @@ public class OrderMqListener {
    @Resource
    private OrderInfoCustomService orderInfoCustomService;
    @Resource
-    private RedisService redisService;
+    private FunUtil funUtil;

    /**
     * 订单上菜
@@ -44,7 +44,7 @@ public class OrderMqListener {
        info = info.replace("UP_ORDER_DETAIL:", "");
        log.info("接收到修改菜品状态mq, info: {}", info);
        String finalInfo = info;
-        redisService.debounce("UP_ORDER_DETAIL:" + info, 5, () -> {
+        funUtil.debounce("UP_ORDER_DETAIL:" + info, 5, () -> {
            orderInfoCustomService.updateOrderDetailStatus(Long.valueOf(finalInfo));

        });
--- a/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java
+++ b/cash-api/order-server/src/main/java/com/czg/task/EntryManagerTask.java
@@ -60,8 +60,8 @@ public class EntryManagerTask {
        for (ShopDirectMerchant shopDirectMerchant : list) {
            String wechatMerchantId = "";
            String alipayMerchantId = "";
-            if (PayCst.EntryStatus.NEED_QUERY_LIST.contains(shopDirectMerchant.getWechatStatus())) {
-                QueryStatusResp wechatStatus = EntryManager.queryWechatEntryStatus(shopDirectMerchant.getMerchantCode());
+            if (PayCst.EntryStatus.NEED_QUERY_LIST.contains(shopDirectMerchant.getWechatStatus()) && StrUtil.isNotBlank(shopDirectMerchant.getWechatApplyId())) {
+                QueryStatusResp wechatStatus = EntryManager.queryWechatEntryStatus(shopDirectMerchant.getWechatApplyId());
                shopDirectMerchant.setWechatStatus(wechatStatus.getStatus());
                shopDirectMerchant.setWechatErrorMsg(wechatStatus.getFailReason());
                shopDirectMerchant.setWechatSignUrl(wechatStatus.getSignUrl());
@@ -69,8 +69,8 @@ public class EntryManagerTask {
                    wechatMerchantId = wechatStatus.getThirdMerchantId();
                }
            }
-            if (PayCst.EntryStatus.NEED_QUERY_LIST.contains(shopDirectMerchant.getAlipayStatus())) {
-                QueryStatusResp alipayStatus = EntryManager.queryAlipayEntryStatus(shopDirectMerchant.getMerchantCode());
+            if (PayCst.EntryStatus.NEED_QUERY_LIST.contains(shopDirectMerchant.getAlipayStatus()) && StrUtil.isNotBlank(shopDirectMerchant.getAlipayOrderId())) {
+                QueryStatusResp alipayStatus = EntryManager.queryAlipayEntryStatus(shopDirectMerchant.getAlipayOrderId());
                shopDirectMerchant.setAlipayStatus(alipayStatus.getStatus());
                shopDirectMerchant.setAlipayErrorMsg(alipayStatus.getFailReason());
                shopDirectMerchant.setAlipaySignUrl(alipayStatus.getSignUrl());
--- a/cash-api/order-server/src/main/java/com/czg/task/OTimeTask.java
+++ b/cash-api/order-server/src/main/java/com/czg/task/OTimeTask.java
@@ -40,7 +40,7 @@ public class OTimeTask {
    @Resource
    private CashierCartService cartService;
    @Resource
-    private OrderPaymentService paymentService;
+    private OrderPaymentService orderPaymentService;
    @Resource
    private GbOrderService gbOrderService;
    @Resource
@@ -118,7 +118,7 @@ public class OTimeTask {

        LocalDateTime tenMinutesAgo = LocalDateTime.now().minusMinutes(10);
        LocalDateTime thirdDayAgo = LocalDateTime.now().minusDays(3);
-        List<OrderPayment> list = paymentService.list(QueryWrapper.create()
+        List<OrderPayment> list = orderPaymentService.list(QueryWrapper.create()
                .gt(OrderPayment::getUpdateTime, thirdDayAgo)
                .lt(OrderPayment::getUpdateTime, tenMinutesAgo)
                .in(OrderPayment::getSourceType, ware)
--- a/cash-api/order-server/src/main/resources/application-dev.yml
+++ b/cash-api/order-server/src/main/resources/application-dev.yml
@@ -25,23 +25,7 @@ spring:
    port: 5672
    username: chaozg
    password: chaozg123
-    # 关键优化：解决MissedHeartbeatException 心跳超时问题
-    connection-timeout: 10000 # 连接超时时间（10秒，避免连接建立过慢）
-    requested-heartbeat: 30 # 心跳间隔调整为30秒（原60秒过长，降低超时概率；过短易误触发）
-    # 自动重连配置（Spring AMQP 自带，关键兜底）
-    publisher-returns: true
-    template:
-      retry:
-        enabled: true # 开启消息发送重试
-        max-attempts: 3 # 最大重试次数
-        initial-interval: 3000 # 首次重试间隔2秒
-        multiplier: 1.5 # 重试间隔倍增因子
-    listener:
-      simple:
-        retry:
-          enabled: true # 开启消费者重试
-          max-attempts: 3 # 消费者最大重试次数
-        acknowledge-mode: auto # 确认模式（可根据业务改为manual）
+
 dubbo:
  application:
    name: order-server
--- a/cash-common/cash-common-api-config/src/main/java/com/czg/config/FilteredNacosRegistry.java
+++ b/cash-common/cash-common-api-config/src/main/java/com/czg/config/FilteredNacosRegistry.java
@@ -54,7 +54,7 @@ public class FilteredNacosRegistry extends NacosRegistry {
    public void register(URL url) {
        // 1. 获取原始注册的方法列表
        String originalMethods = url.getParameter("methods");
-//        log.info("【过滤提示】服务 {} 注册方法：{}", url.getServiceInterface(), originalMethods);
+        log.info("【过滤提示】服务 {} 注册方法：{}", url.getServiceInterface(), originalMethods);
        if (originalMethods != null && !originalMethods.isEmpty()) {
            // 2. 过滤黑名单中的方法名
            List<String> filteredMethods = Arrays.stream(originalMethods.split(","))
@@ -67,12 +67,12 @@ public class FilteredNacosRegistry extends NacosRegistry {
            // 3. 处理过滤后的结果
            if (filteredMethods.isEmpty()) {
                // 若所有方法都被过滤，直接终止注册（可选：根据业务决定是否保留服务注册）
-//                log.info("【过滤提示】服务 {} 所有方法均被过滤，终止注册", url.getServiceInterface());
+                log.info("【过滤提示】服务 {} 所有方法均被过滤，终止注册", url.getServiceInterface());
                return;
            } else {
                // 替换 URL 中的 methods 参数为过滤后的列表
                url = url.addParameter("methods", String.join(",", filteredMethods));
-//                log.info("【过滤提示】服务 {} 注册方法：{}", url.getServiceInterface(), filteredMethods);
+                log.info("【过滤提示】服务 {} 注册方法：{}", url.getServiceInterface(), filteredMethods);
            }
        }

--- a/cash-common/cash-common-api-config/src/main/java/com/czg/config/MybatisFlexConfig.java
+++ b/cash-common/cash-common-api-config/src/main/java/com/czg/config/MybatisFlexConfig.java
@@ -1,6 +1,5 @@
 package com.czg.config;

-import cn.hutool.core.util.StrUtil;
 import com.mybatisflex.core.audit.AuditManager;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Configuration;
@@ -18,24 +17,8 @@ public class MybatisFlexConfig {
        //设置 SQL 审计收集器
        AuditManager.setMessageCollector(auditMessage ->
                log.info("[sql] time: {}, size: {}, sql:\n{}",
-                        auditMessage.getElapsedTime(), auditMessage.getQueryCount(), compressSql(auditMessage.getFullSql())));
+                        auditMessage.getElapsedTime(), auditMessage.getQueryCount(), auditMessage.getFullSql())
+        );
    }

-    /**
-     * 精简SQL：去除多余换行、制表符、连续空格，保留语法必需空格
-     *
-     * @param originalSql 原始带换行/空格的SQL
-     * @return 精简后的SQL
-     */
-    public static String compressSql(String originalSql) {
-        if (StrUtil.isBlank(originalSql)) {
-            return "";
-        }
-        // 1. 替换所有换行、制表符为单个空格
-        String tempSql = originalSql.replaceAll("\\r\\n|\\r|\\n|\\t", " ");
-        // 2. 替换多个连续空格为单个空格
-        tempSql = tempSql.replaceAll("\\s+", " ");
-        // 3. 去除首尾空格
-        return tempSql.trim();
-    }
 }
--- a/cash-common/cash-common-redis/src/main/java/com/czg/service/RedisService.java
+++ b/cash-common/cash-common-redis/src/main/java/com/czg/service/RedisService.java
@@ -6,15 +6,14 @@ import jakarta.annotation.Resource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.script.DefaultRedisScript;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;

-import java.util.*;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.function.Supplier;

 /**
 * @author GYJoker
@@ -651,106 +650,4 @@ public class RedisService {
        }
        return JSON.parseArray(jsonStr, type);
    }
-
-
-    public static int retryCount = 5;
-
-    /**
-     * 执行任务并保证锁唯一
-     *
-     * @param supplier 业务逻辑
-     * @param lockKey  Redis锁的Key
-     * @return 业务逻辑返回值
-     */
-    public <T> T runFunAndCheckKey(Supplier<T> supplier, String lockKey) {
-        String lockValue = String.valueOf(System.nanoTime() + Thread.currentThread().threadId());
-        try {
-            // 尝试获取锁，超时时间 5 秒，防止死锁
-            boolean lock = Boolean.TRUE.equals(redisTemplate.opsForValue().setIfAbsent(lockKey, lockValue, 5, TimeUnit.SECONDS));
-            int count = 0;
-            // 初始等待 10ms
-            int retryDelay = 10;
-
-            while (!lock) {
-                // 最多重试 10 次，大约 10 秒
-                if (count++ > 50) {
-                    throw new RuntimeException("系统繁忙, 稍后再试");
-                }
-                Thread.sleep(retryDelay);
-                // 指数退避，最大等待 200ms
-                retryDelay = Math.min(retryDelay * 2, 200);
-                lock = Boolean.TRUE.equals(redisTemplate.opsForValue().setIfAbsent(lockKey, lockValue, 5, TimeUnit.SECONDS));
-            }
-
-            // 执行任务
-            return supplier.get();
-        } catch (InterruptedException e) {
-            Thread.currentThread().interrupt();
-            throw new RuntimeException("线程被中断", e);
-        } catch (Exception e) {
-            log.error("执行出错：{}", e.getMessage(), e);
-            throw e;
-        } finally {
-            // 释放锁（使用 Lua 脚本确保原子性）
-            unlock(lockKey, lockValue);
-        }
-    }
-
-    /**
-     * 使用 Lua 脚本确保释放锁的原子性
-     *
-     * @param lockKey   锁的 Key
-     * @param lockValue 当前线程的锁值
-     */
-    private void unlock(String lockKey, String lockValue) {
-        String luaScript =
-                "if redis.call('get', KEYS[1]) == ARGV[1] then " +
-                        "return redis.call('del', KEYS[1]) " +
-                        "else return 0 end";
-        redisTemplate.execute(new DefaultRedisScript<>(luaScript, Long.class),
-                Collections.singletonList(lockKey), lockValue);
-    }
-
-    public static <T, R> R runFunAndRetry(
-            Supplier<R> function,
-            Function<R, Boolean> check, Consumer<R> errFun) {
-        R result = function.get();
-        boolean flag = check.apply(result);
-
-        while (flag && retryCount-- > 0) {
-            result = function.get();
-            flag = check.apply(result);
-        }
-
-        if (flag) {
-            errFun.accept(result);
-        }
-        return result;
-    }
-
-
-    /**
-     * 防抖函数：在指定秒数内相同 Key 的任务只会执行一次
-     *
-     * @param key     防抖使用的 Redis Key
-     * @param seconds 防抖时间（秒）
-     * @param task    要执行的业务逻辑
-     * @return true 执行了任务；false 在防抖期内被拦截
-     */
-    public boolean debounce(String key, long seconds, Runnable task) {
-        try {
-            Boolean success = redisTemplate.opsForValue().setIfAbsent(
-                    key, "1", seconds, TimeUnit.SECONDS
-            );
-
-            if (Boolean.TRUE.equals(success)) {
-                task.run();
-                return true;
-            }
-            return false;
-        } catch (Exception e) {
-            log.error("防抖函数执行失败 key={} err={}", key, e.getMessage(), e);
-            return false;
-        }
-    }
 }
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/dto/shopinfo/ShopInfoEditDTO.java
@@ -285,13 +285,4 @@ public class ShopInfoEditDTO {
     */
    private Integer isCountStick;

-    /**
-     * 企业id
-     */
-    private String weworkId;
-    /**
-     * 企业接入链接
-     */
-    private String weworkUrl;
-
 }
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/QuickMenu.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/QuickMenu.java
@@ -1,69 +0,0 @@
-package com.czg.account.entity;
-
-import com.mybatisflex.annotation.Column;
-import com.mybatisflex.annotation.Id;
-import com.mybatisflex.annotation.KeyType;
-import com.mybatisflex.annotation.Table;
-import java.io.Serializable;
-import java.time.LocalDateTime;
-
-import java.io.Serial;
-
-import jakarta.validation.constraints.NotNull;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 悬浮窗配置 实体类。
- *
- * @author ww
- * @since 2025-12-29
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-@Table("tb_quick_menu")
-public class QuickMenu implements Serializable {
-
-    @Serial
-    private static final long serialVersionUID = 1L;
-
-    @Id(keyType = KeyType.Auto)
-    private Integer id;
-
-    /**
-     * 店铺Id
-     */
-    private Long shopId;
-    /**
-     * 菜单图标
-     */
-    private String url;
-
-
-    /**
-     * 菜单Id
-     */
-    @NotNull(message = "关联菜单不能为空")
-    private Long menuId;
-
-    /**
-     * 排序
-     */
-    private Integer sort;
-
-    /**
-     * 状态 1-启用 0-禁用
-     */
-    private Integer status;
-
-    @Column(onInsertValue = "now()")
-    private LocalDateTime createTime;
-
-    @Column(onInsertValue = "now()", onUpdateValue = "now()")
-    private LocalDateTime updateTime;
-
-}
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopConfig.java
@@ -135,13 +135,5 @@ public class ShopConfig implements Serializable {

 	private String dingAppKey;
 	private String dingAppSecret;
-    /**
-	 * 企业id
-	 */
-	private String weworkId;
-    /**
-	 * 企业接入链接
-	 */
-	private String weworkUrl;

 }
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopInfo.java
@@ -371,15 +371,4 @@ public class ShopInfo implements Serializable {
     */
    private BigDecimal amount;

-    /**
-     * 企业id
-     */
-    @Column(ignore = true)
-    private String weworkId;
-    /**
-     * 企业接入链接
-     */
-    @Column(ignore = true)
-    private String weworkUrl;
-
 }
--- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/QuickMenuService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/QuickMenuService.java
@@ -1,14 +0,0 @@
-package com.czg.account.service;
-
-import com.mybatisflex.core.service.IService;
-import com.czg.account.entity.QuickMenu;
-
-/**
- * 悬浮窗配置 服务层。
- *
- * @author ww
- * @since 2025-12-29
- */
-public interface QuickMenuService extends IService<QuickMenu> {
-
-}
--- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkDistributionUserService.java
@@ -7,12 +7,10 @@ import com.czg.exception.CzgException;
 import com.czg.market.dto.MkDistributionUserDTO;
 import com.czg.market.dto.MkDistributionWithdrawFlowDTO;
 import com.czg.market.entity.MkDistributionConfig;
-import com.czg.market.entity.MkDistributionFlow;
 import com.czg.market.entity.MkDistributionUser;
 import com.czg.market.vo.DistributionCenterShopVO;
 import com.czg.market.vo.InviteUserVO;
 import com.czg.order.dto.MkDistributionPayDTO;
-import com.czg.order.entity.OrderInfo;
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;

@@ -125,8 +123,6 @@ public interface MkDistributionUserService extends IService<MkDistributionUser>

    void refund(Long orderId, String orderNo);

-    void distributionUserAmount(MkDistributionFlow item, OrderInfo orderInfo);
-
    /**
     * 发放分销奖励
     *
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoDTO.java
@@ -0,0 +1,267 @@
+
+package com.czg.order.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 订单表 实体类。
+ *
+ * @author ww
+ * @since 2025-02-13
+ */
+@Data
+
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrderInfoDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 订单编号
+     * pc 收银机客户端  PC+雪花ID
+     * wechat 微信小程序 WX+雪花ID
+     * alipay 支付宝小程序 ALI+雪花ID
+     * admin-pc PC管理端 WEB+雪花ID
+     * admin-app APP管理端 APP+雪花ID
+     */
+    private String orderNo;
+
+    /**
+     * 店铺Id
+     */
+    private Long shopId;
+
+    /**
+     * 用户Id user_info表的id
+     */
+    private Long userId;
+
+    /**
+     * 退单金额
+     */
+    private BigDecimal refundAmount;
+
+    /**
+     * 订单原金额 不含折扣价格
+     */
+    private BigDecimal originAmount;
+    /**
+     * 抹零金额 减免多少钱
+     */
+    private BigDecimal roundAmount;
+    /**
+     * 优惠总金额
+     */
+    private BigDecimal discountAllAmount;
+
+    /**
+     * 订单金额 (扣除各类折扣)
+     */
+    private BigDecimal orderAmount;
+
+    /**
+     * 实际支付金额
+     */
+    private BigDecimal payAmount;
+
+    /**
+     * 积分抵扣金额
+     */
+    private BigDecimal pointsDiscountAmount;
+
+    /**
+     * 使用的积分数量
+     */
+    private Integer pointsNum;
+
+    /**
+     * 商品优惠券抵扣金额
+     */
+    private BigDecimal productCouponDiscountAmount;
+
+    /**
+     * 用户使用的卡券
+     */
+    private String couponInfoList;
+
+    /**
+     * 满减活动抵扣金额
+     */
+    private BigDecimal discountActAmount;
+
+    /**
+     * 折扣金额
+     */
+    private BigDecimal discountAmount;
+
+//    /**
+//     * 折扣比例
+//     */
+//    private BigDecimal discountRatio;
+
+    /**
+     * 打包费
+     */
+    private BigDecimal packFee;
+
+    /**
+     * 台桌Id
+     */
+    private String tableCode;
+
+    /**
+     * 台桌名称
+     */
+    private String tableName;
+
+    /**
+     * 订单类型-
+     * cash收银(除小程序以外 都属于收银)
+     * miniapp小程序
+     */
+    private String orderType;
+
+    /**
+     * 平台类型  pc 收银机客户端 wechat 微信小程序 alipay 支付宝小程序 admin-pc PC管理端 admin-app APP管理端
+     */
+    private String platformType;
+
+    /**
+     * 用餐模式 堂食 dine-in  外带 take-out 外卖 take-away
+     */
+    private String dineMode;
+
+    /**
+     * 支付模式:
+     * 后付费 after-pay
+     * 先付费 before-pay
+     * 无桌码 no-table
+     */
+    private String payMode;
+
+    /**
+     * 支付类型
+     * 主扫 main-scan
+     * 被扫 back-scan
+     * 微信小程序 wechat-mini
+     * 支付宝小程序 alipay-mini
+     * 会员支付 vip-pay
+     * 现金支付 cash-pay
+     */
+    private String payType;
+
+    /**
+     * 状态: unpaid-待支付;in-production 制作中;wait_out 待取餐;;done-订单完成;refunding-申请退单;refund-退单;part_refund 部分退单;cancelled-取消订单
+     */
+    private String status;
+
+    /**
+     * 折扣信息 json
+     */
+    private String discountInfo;
+
+    /**
+     * 限时折扣信息 json
+     */
+    private String limitRate;
+
+    /**
+     * 是否支持退款，1支持退单， 0不支持退单
+     */
+    private Integer refundAble;
+
+    /**
+     * 支付时间
+     */
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime paidTime;
+
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime updateTime;
+
+    /**
+     * 支付订单号
+     * tb_order_payment.id
+     * tb_shop_user_flow.id
+     */
+    private Long payOrderId;
+
+    /**
+     * 交易日期
+     */
+    private String tradeDay;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 取餐码
+     */
+    private String takeCode;
+
+    /**
+     * 员工id
+     */
+    private Long staffId;
+
+    /**
+     * 当前订单下单次数
+     */
+    private Integer placeNum;
+
+    /**
+     * 用餐人数
+     */
+    private Integer seatNum;
+
+    /**
+     * 餐位费
+     */
+    private BigDecimal seatAmount;
+
+    /**
+     * 退款备注
+     */
+    private String refundRemark;
+
+    /**
+     * 是否使用了霸王餐
+     */
+    private Integer isFreeDine;
+
+    /**
+     * 是否等叫 0 否 1 等叫
+     */
+    private Integer isWaitCall;
+
+    /**
+     * 挂账人id
+     */
+    private Long creditBuyerId;
+
+    /**
+     * 是否回收站 0-否，1回收站
+     */
+    private Integer isDel;
+    private String failMsg;
+
+}
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java
@@ -1,8 +1,6 @@
 package com.czg.order.entity;

 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson2.JSONArray;
-import com.alibaba.fastjson2.JSONObject;
 import com.czg.order.dto.LimitRateDTO;
 import com.mybatisflex.annotation.Column;
 import com.mybatisflex.annotation.Id;
@@ -300,10 +298,8 @@ public class OrderInfo implements Serializable {
    private Integer isDel;

    private String failMsg;
-    /**
-     * 打印状态 Json格式
-     */
-    private String printStatus;
+
+


    public String getRefundRemark() {
@@ -346,41 +342,4 @@ public class OrderInfo implements Serializable {
        // 如果需要加上抹零金额，可以取消下面这行注释
        // .add(this.getRoundAmount() != null ? this.getRoundAmount() : BigDecimal.ZERO);
    }
-
-    private JSONArray getPrintStatusAsArray() {
-        if (StrUtil.isBlank(printStatus)) {
-            return new JSONArray();
-        }
-        try {
-            return JSONArray.parseArray(printStatus.trim());
-        } catch (Exception e) {
-            return new JSONArray();
-        }
-    }
-
-    public void upPrintStatus(JSONObject printJson, boolean isPrintSuccess) {
-        String currentDeviceId = printJson.getString("id");
-        JSONArray oldPrintStatusArray = getPrintStatusAsArray();
-        // 3. 初始化新的打印状态JSON数组（用于存储处理后的结果）
-        JSONArray newPrintStatusArray = new JSONArray();
-        // 场景1：打印成功 - 移除原有数组中与当前设备ID一致的记录，保留其余记录
-        if (oldPrintStatusArray != null && !oldPrintStatusArray.isEmpty()) {
-            for (int i = 0; i < oldPrintStatusArray.size(); i++) {
-                JSONObject deviceObj = oldPrintStatusArray.getJSONObject(i);
-                String deviceId = deviceObj.getString("id");
-                // 仅保留非当前设备ID的记录
-                if (currentDeviceId != null && !currentDeviceId.equals(deviceId)) {
-                    newPrintStatusArray.add(deviceObj);
-                }
-            }
-        }
-        if (!isPrintSuccess) {
-            newPrintStatusArray.add(printJson);
-        }
-        if (!newPrintStatusArray.isEmpty()) {
-            printStatus = newPrintStatusArray.toJSONString();
-        } else {
-            printStatus = "";
-        }
-    }
 }
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/service/PrintMachineLogService.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/service/PrintMachineLogService.java
@@ -11,8 +11,6 @@ import com.czg.order.entity.PrintMachineLog;
 * @since 2025-03-11
 */
 public interface PrintMachineLogService extends IService<PrintMachineLog> {
-    void save(Long orderId, PrintMachine config, String bizType, String printContent, String respJson);
-
-    void save(PrintMachine config, String bizType, String printContent, String respJson);
+    void save(PrintMachine config, String bizType, String printContent, Object respJson);

 }
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderDetailSmallVO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderDetailSmallVO.java
@@ -41,6 +41,6 @@ public class OrderDetailSmallVO implements Serializable {
    private LocalDateTime startOrderTime;
    private LocalDateTime dishOutTime;
    private LocalDateTime foodServeTime;
-    private Integer isTemporary;
+
 }

--- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderInfoVo.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderInfoVo.java
@@ -133,11 +133,6 @@ public class OrderInfoVo implements Serializable {
     * 备注
     */
    private String remark;
-    /**
-     * 打印状态 Json格式
-     * [{"id":"124","name":"111","time":"2025-12-29 11:05:18"},{"id":"111","name":"标签","time":"2025-12-29 11:05:30"}]
-     */
-    private String printStatus;

    /**
     * 是否使用了霸王餐
--- a/cash-sdk/aggregation-pay/src/main/java/com/czg/EntryManager.java
+++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/EntryManager.java
@@ -9,6 +9,7 @@ import com.czg.dto.resp.EntryThirdRespDto;
 import com.czg.dto.resp.QueryStatusResp;
 import com.czg.exception.CzgException;
 import com.czg.third.alipay.AlipayEntryManager;
+import com.czg.third.alipay.AlipayIsvEntryManager;
 import com.czg.third.wechat.WechatEntryManager;
 import com.czg.utils.AssertUtil;
 import com.czg.utils.AsyncTaskExecutor;
@@ -40,7 +41,7 @@ public class EntryManager {
    /**
     * 查询微信进件状态
     *
-     * @param merchantCode 商户编号
+     * @param merchantCode 商户编号, 进件时返回的批次号 {@link EntryRespDto#wechatApplyId}
     * @return 进件状态
     */
    public static QueryStatusResp queryWechatEntryStatus(String merchantCode) {
@@ -50,11 +51,11 @@ public class EntryManager {
    /**
     * 查询支付宝进件状态
     *
-     * @param merchantCode 商户编号
+     * @param batchNo 商户编号, 进件时返回的批次号 {@link EntryRespDto#alipayOrderId}
     * @return 进件状态
     */
-    public static QueryStatusResp queryAlipayEntryStatus(String merchantCode) {
-        return AlipayEntryManager.queryMerchantEntryStatus(null, merchantCode);
+    public static QueryStatusResp queryAlipayEntryStatus(String batchNo) {
+        return AlipayIsvEntryManager.queryMerchantBatchStatus(null, batchNo);
    }

    /**
@@ -77,7 +78,7 @@ public class EntryManager {
            tasks.add(() -> WechatEntryManager.entryMerchant(null, reqDto));
        }
        if (ArrayUtil.contains(platform, PayCst.Platform.ALIPAY)) {
-            tasks.add(() -> AlipayEntryManager.entryMerchant(null, reqDto));
+            tasks.add(() -> AlipayIsvEntryManager.entryMerchant(null, reqDto));
        }

        // 执行所有任务
@@ -235,6 +236,7 @@ public class EntryManager {
        AssertUtil.isBlank(baseInfo.getUserType(), "商户类型不能为空");
        AssertUtil.isBlank(baseInfo.getShortName(), "商户简称不能为空");
        AssertUtil.isBlank(baseInfo.getMccCode(), "商户行业编码不能为空");
+        AssertUtil.isBlank(baseInfo.getAlipayAccount(), "支付宝账号不能为空");
        AssertUtil.isBlank(baseInfo.getContactPersonType(), "联系人类型不能为空");
        if (!PayCst.ContactPersonType.SUPER.equals(baseInfo.getContactPersonType()) && !PayCst.ContactPersonType.LEGAL.equals(baseInfo.getContactPersonType())) {
            throw new CzgException("联系人类型错误");
@@ -367,11 +369,11 @@ public class EntryManager {
 //        uploadParamImage(merchantDto);

        verifyEntryParam(merchantDto);
-        uploadParamImage(merchantDto);
-        System.out.println(merchantDto);
+//        uploadParamImage(merchantDto);
+//        System.out.println(merchantDto);
 //        entryMerchant(merchantDto, PayCst.Platform.WECHAT);
-//        entryMerchant(merchantDto, PayCst.Platform.ALIPAY);
-        entryMerchant(merchantDto, PayCst.Platform.WECHAT, PayCst.Platform.ALIPAY);
+        entryMerchant(merchantDto, PayCst.Platform.ALIPAY);
+//        entryMerchant(merchantDto, PayCst.Platform.WECHAT, PayCst.Platform.ALIPAY);
    }

    private static AggregateMerchantDto getTestMerchantEntryData() {
@@ -382,7 +384,8 @@ public class EntryManager {
        baseInfoDto.setUserType("1");
        baseInfoDto.setCompanyChildType("1");
        baseInfoDto.setShortName("测试商户");
-        baseInfoDto.setMccCode("0741");
+        baseInfoDto.setAlipayAccount("1157756119@qq.com");
+        baseInfoDto.setMccCode("A0001_B0001");
        baseInfoDto.setContactPersonType(PayCst.ContactPersonType.SUPER);
        baseInfoDto.setContactName("张三");
        baseInfoDto.setContactPersonId("110101199001011234");
--- a/cash-sdk/aggregation-pay/src/main/java/com/czg/PayCst.java
+++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/PayCst.java
@@ -10,6 +10,11 @@ import java.util.List;
 */
 public interface PayCst {

+    /**
+     * 长期有效时间
+     */
+    String LONG_TERM_DATE = "2099-12-31";
+
    /**
     * 平台
     */
--- a/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/resp/QueryStatusResp.java
+++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/resp/QueryStatusResp.java
@@ -1,6 +1,7 @@
 package com.czg.dto.resp;

 import lombok.Data;
+import lombok.experimental.Accessors;

 /**
 * 查询进件状态
@@ -8,6 +9,7 @@ import lombok.Data;
 * @date 2026/1/7 17:12
 */
@Data
+@Accessors(chain = true)
 public class QueryStatusResp {

    /**
--- a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayEntryManager.java
+++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayEntryManager.java
@@ -2,6 +2,7 @@ package com.czg.third.alipay;

 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
 import com.alipay.api.AlipayApiException;
 import com.alipay.api.DefaultAlipayClient;
 import com.alipay.api.FileItem;
@@ -344,11 +345,12 @@ public class AlipayEntryManager {
        return entryParams;
    }

-    public static void main(String[] args) {
+    public static void main(String[] args) throws ApiException {

 //        queryBankBranchList("CMB", "陕西省", "西安市");
-        uploadImage(null, "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg");
+//        uploadImage(null, "https://cashier-oss.oss-cn-beijing.aliyuncs.com/upload/20240312/31476c871c224389aea0ac4e17c964a3.jpg");

+        test();
    }

    // https://opendocs.alipay.com/solution/0dec7x?pathHash=caec4753  直付通
@@ -361,6 +363,7 @@ public class AlipayEntryManager {
        alipayConfig.setAlipayPublicKey("MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiQkrz+emAuS1mB3KKDOMmAZRd/BlPbh7fAIHAqAj1+QCZNcV3o2BTLIIqnuKpSlFXDG3uDzp2VsBxcizXuBbFyPGylnD9CgCj5abyh3+FIHPAZ2IM3TtpqImZ0TSPGXrMli4Nir7MvZktgccCqQKCC4o6iaDGz+UwWwJUIPna8fm2tiTZ+KH150CZbKVj4ZGNpBh5XSV/1dRgyQIV9D/EwSbkZ0n6VgKQLJBi0C2UE3QB17aL1Ir6+gDXIDbknN8O7GUD3aMGdThYdSRUb5wp9CZ5qfV7vCS/CgaRo38nhH3NOzkTL+7v0m1ZDHPmqEkn9VzZN6sCQdL7PoAOjHOCwIDAQAB");
        alipayConfig.setPrivateKey("MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCz3FkdffxZibdwis9W7eOW1dEjGAbSvRDL2ikfeCIW5KZNoIjUqxI0mIoUlLRRKO71QLHZS1Vb2aJp8jeOAqIPa8e76HTneQEzk3FGA8gpraSGvbadHWzvxnmYKsts1TBiEZQL82ySJXhQTJvZ6jyDM7s6wHHUnrH+Qi29QpppQ1sxsoJeCtajUgRg3btD6XbBcyFAX3pzM56Kw9eaIjZoD8WToZOM/Y3sqNL2uo8lLqcIpTrI7Pq5ZOspmBQ+t8v3rS9IdDZZMvd0trzS67AXwHz8rKPBT/lL1A4iHnXCHUvktusX1fPs3/RGY/a7PIddaBLnfY0GcueE16K7QcrXAgMBAAECggEAbSdT2eckp75BWoaTcGEs1tRqeM7TDT/6moyKmnOQ1K3tE31SrSYpBUxxuC3LBNo/sw2RIZtrcTOyMnPyLTgB3DP/4lUf5X51MTTQ8LnI1ypvh+pIki9Sdm3QS33lOOZk149tdpdDk6ozyx/DEcvq74EMpoo2SuAIi5LkKVDrXuehvGA/WeXtpmuPgqRFdIA+JBlA3knHk5XEQY/k2Y31gq5oCwNL9iT9OAZqVkukE6EnvCXE9t2rAV4/snYilaf/UaO+ktgEwSbPBQ8YKlovDAarMBbGtgr6E174A9djlPyR+W/fgx8rlTwSWtieb9MkO8LN3KSxgVs0kY5U8OHg8QKBgQDljJq9kTFHare+W/fAXdUy3tJprfNQCAii6s+GuDfTQiviVQDtWmdtHAN+xU3to7MepvVhwHsqtQnZXKTtZuwwxn82FNl7A5RYD3GVFW+wG6AsGLIdESrWxySoL6Kx8QmNpMEVg8acT/ywzW/RnUXS5vU7GIi8GA0vtyBo24R9KQKBgQDIlf/R9+iNk9oXlbB/k4um9eVvBBS7l5cx4E5Id5Dpp4kGZfPZEa7oDsEUstZZM9mgQLJK/noNWbcf0+BohCR5ux7SC12qIoxwN3k4BzTDqrS8BzFuVVp5PELUsf/uCbRn05iMzpiDUhj3Vde04wvjHYIobfKlZO2HeSWXCpUH/wKBgQC8wSuU6ck90pEY5QMKmZ3wYK1g3PsQOirv3Gmde+nbu7PePsuuYQJfBAQTwCZeXJezgtKP+PjOm2Nn6vhrhpB9YxvD2s0ijET1TG23i5L1myHQYNZFdJJnXgXUjqcX7v5ODMYA7QTqEBPXRnbGRK7fx66rU3dMQ/LD46+wyaFeUQKBgA4QTk53dkuu6SSsLyLSwoDjTsHY5Gc+urAZjQORtoxbXcUgEtfOYJgOqMT9wP+iHgkZYCbX7tDO0IMfxOUvFqueTgvmFhwergAUM6CVCMMLTf689l9JBr3nVrw4+rvC3G5HLLP6rEDQ2cVFtIkPPj8fS4fwJYopKGpOOS9843QbAoGBAMoHH8LqoZ50FLsospx/hJe24Cd8wCgQTXSa/hMqNZ1999JDhftMt7R0ZdB1he2LReACe0K9ntBU4H4u225zZ3wZlyOfoyerAHuLK/ysNlgIIzblZlOxbBJ64Kul8leXzlYy3tOZuZ997KqBcWPCE3LUBBNvM6E3blJUnlmJAVoi");
        defaultClient.setAlipayConfig(alipayConfig);
+        log.info("dd: {}", JSONObject.toJSONString(alipayConfig));
        AlipayOpenAgentApi api = new AlipayOpenAgentApi();
        AlipayOpenAgentCreateModel data = new AlipayOpenAgentCreateModel();
        ContactModel contactInfo = new ContactModel();
--- a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvEntryManager.java
+++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvEntryManager.java
@@ -0,0 +1,239 @@
+package com.czg.third.alipay;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.alipay.v3.ApiException;
+import com.alipay.v3.api.*;
+import com.alipay.v3.model.*;
+import com.czg.PayCst;
+import com.czg.dto.req.*;
+import com.czg.dto.resp.EntryThirdRespDto;
+import com.czg.dto.resp.QueryStatusResp;
+import com.czg.exception.CzgException;
+import com.czg.third.alipay.dto.config.AlipayConfigDto;
+import com.czg.utils.UploadFileUtil;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.File;
+import java.io.IOException;
+
+/**
+ * 支付宝服务商进件管理
+ * <a href="https://opendocs.alipay.com/open-v3/b4c46445_alipay.open.agent.create?scene=common&pathHash=d7084b4b">...</a>
+ * @author yjjie
+ * @date 2026/1/8 13:34
+ */
+@Slf4j
+public class AlipayIsvEntryManager {
+
+    private static final String ERR_MESSAGE_KEY = "message";
+
+    public static QueryStatusResp queryMerchantBatchStatus(AlipayConfigDto configDto, String batchNo) {
+        QueryStatusResp respDto = new QueryStatusResp()
+                .setPlatform(PayCst.Platform.ALIPAY);
+        AlipayClient.setApiClient(configDto);
+
+        try {
+            AlipayOpenAgentOrderApi api = new AlipayOpenAgentOrderApi();
+            AlipayOpenAgentOrderQueryResponseModel response = api.query(batchNo);
+
+            log.info("支付宝查询进件状态: 响应={}", response);
+            respDto.setApplyId(batchNo);
+
+            switch (response.getOrderStatus()) {
+                case "MERCHANT_INFO_HOLD" -> {
+                    respDto.setStatus(PayCst.EntryStatus.REJECTED);
+                    respDto.setFailReason("三方异常，请重新提交");
+                    return respDto;
+                }
+                case "MERCHANT_CONFIRM_TIME_OUT" -> {
+                    respDto.setStatus(PayCst.EntryStatus.REJECTED);
+                    respDto.setFailReason("商户确认超时，请重新提交");
+                    return respDto;
+                }
+                case "MERCHANT_AUDITING" -> {
+                    respDto.setStatus(PayCst.EntryStatus.AUDIT);
+                    respDto.setFailReason("");
+                    return respDto;
+                }
+                case "MERCHANT_CONFIRM" -> {
+                    respDto.setStatus(PayCst.EntryStatus.SIGN);
+                    respDto.setFailReason("");
+                    respDto.setSignUrl(response.getConfirmUrl());
+                    return respDto;
+                }
+                case "MERCHANT_APPLY_ORDER_CANCELED" -> {
+                    respDto.setStatus(PayCst.EntryStatus.REJECTED);
+                    respDto.setFailReason(response.getRejectReason());
+                    return respDto;
+                }
+                case "MERCHANT_CONFIRM_SUCCESS" -> {
+                    respDto.setStatus(PayCst.EntryStatus.FINISH);
+                    respDto.setFailReason("");
+                    respDto.setThirdMerchantId(response.getMerchantPid());
+                    return respDto;
+                }
+                case null -> {
+                    respDto.setStatus(PayCst.EntryStatus.REJECTED);
+                    respDto.setFailReason("查询失败");
+                    return respDto;
+                }
+                default -> {
+                    return respDto;
+                }
+            }
+
+        } catch (ApiException e) {
+            String body = e.getResponseBody();
+            log.error("支付宝查询进件状态异常: {}", body);
+            JSONObject object = JSONObject.parseObject(body);
+            respDto.setStatus(PayCst.EntryStatus.REJECTED);
+            respDto.setFailReason(object.getString(ERR_MESSAGE_KEY));
+            return respDto;
+        }
+    }
+
+    /**
+     * 创建商户
+     * @param configDto 配置信息
+     * @param reqDto 请求信息
+     */
+    public static EntryThirdRespDto entryMerchant(AlipayConfigDto configDto, AggregateMerchantDto reqDto) {
+        AlipayClient.setApiClient(configDto);
+        EntryThirdRespDto respDto = new EntryThirdRespDto()
+                .setPlatform(PayCst.Platform.ALIPAY);
+        try {
+            String batchNo = createRequest(reqDto);
+
+            AlipayOpenAgentFacetofaceSignModel signModel = buildFaceToFaceModel(reqDto, batchNo);
+            File businessLicensePic = UploadFileUtil.getFileByUrl(reqDto.getBusinessLicenceInfo().getLicensePic().getUrl());
+            File shopScenePic = UploadFileUtil.getFileByUrl(reqDto.getStoreInfo().getInsidePic().getUrl());
+            File shopSignBoardPic = UploadFileUtil.getFileByUrl(reqDto.getStoreInfo().getDoorPic().getUrl());
+
+            // 构造请求参数以调用接口
+            AlipayOpenAgentFacetofaceApi api = new AlipayOpenAgentFacetofaceApi();
+            Object response = api.sign(null, businessLicensePic, signModel, shopScenePic, shopSignBoardPic, null);
+            log.info("支付宝开启代商户签约: 响应={}", JSONObject.toJSONString(response));
+
+            try {
+                String orderNo = confirmRequest(batchNo);
+                respDto.setEntryId(orderNo);
+                respDto.setStatus(PayCst.EntryStatus.INIT);
+                respDto.setErrorMsg("");
+                return respDto;
+            } catch (CzgException e) {
+                respDto.setStatus(PayCst.EntryStatus.REJECTED);
+                respDto.setErrorMsg(e.getMessage());
+                return respDto;
+            }
+        } catch (ApiException e) {
+            String body = e.getResponseBody();
+            log.error("支付宝开启代商户签约，创建应用事务异常: {}", body);
+            JSONObject object = JSONObject.parseObject(body);
+            respDto.setStatus(PayCst.EntryStatus.REJECTED);
+            respDto.setErrorMsg(object.getString(ERR_MESSAGE_KEY));
+            return respDto;
+        } catch (IOException e) {
+            log.error("上传图片出错", e);
+            respDto.setStatus(PayCst.EntryStatus.REJECTED);
+            respDto.setErrorMsg("上传图片出错");
+            return respDto;
+        }
+    }
+
+    /**
+     * 开启代商户签约、创建应用事务
+     * @param reqDto 请求信息
+     * @return 请求ID
+     */
+    public static String createRequest(AggregateMerchantDto reqDto) {
+        AlipayOpenAgentApi api = new AlipayOpenAgentApi();
+        AlipayOpenAgentCreateModel openModel = new AlipayOpenAgentCreateModel();
+
+        MerchantBaseInfoDto info = reqDto.getMerchantBaseInfo();
+        LegalPersonInfoDto legalPersonInfo = reqDto.getLegalPersonInfo();
+        String contactPersonType = info.getContactPersonType();
+        boolean isSuper = PayCst.ContactPersonType.SUPER.equals(contactPersonType);
+
+        ContactModel contactModel = new ContactModel();
+        // 联系人名称
+        contactModel.setContactName(isSuper ? info.getContactName() : legalPersonInfo.getLegalPersonName());
+        // 联系人手机号码
+        contactModel.setContactMobile(isSuper ? info.getContactPhone() : legalPersonInfo.getLegalPersonPhone());
+        // 联系人邮箱
+        contactModel.setContactEmail(isSuper ? info.getContactEmail() : legalPersonInfo.getLegalPersonEmail());
+        openModel.setContactInfo(contactModel);
+
+        openModel.setAccount(reqDto.getMerchantBaseInfo().getAlipayAccount());
+
+        try {
+            AlipayOpenAgentCreateResponseModel responseModel = api.create(openModel);
+            log.info("支付宝开启代商户签约，开启事务: 结果={}, batchNo={}", responseModel.getBatchStatus(), responseModel.getBatchNo());
+            return responseModel.getBatchNo();
+        } catch (ApiException e) {
+            String body = e.getResponseBody();
+            log.error("支付宝开启代商户签约，开启事务异常: {}", body);
+            JSONObject object = JSONObject.parseObject(body);
+            throw new CzgException("支付宝开启代商户签约，开启事务异常: " + object.getString(ERR_MESSAGE_KEY));
+        }
+    }
+
+    public static String confirmRequest(String batchNo) {
+        AlipayClient.setApiClient(null);
+        // 构造请求参数以调用接口
+        AlipayOpenAgentCommonsignApi api = new AlipayOpenAgentCommonsignApi();
+        AlipayOpenAgentCommonsignConfirmModel data = new AlipayOpenAgentCommonsignConfirmModel();
+
+        // 设置ISV 代商户操作事务编号
+        data.setBatchNo(batchNo);
+        try {
+            AlipayOpenAgentCommonsignConfirmResponseModel response = api.confirm(data);
+            log.info("支付宝开启代商户签约，确认事务: 响应={}", response);
+            return response.getOrderNo();
+        } catch (ApiException e) {
+            String body = e.getResponseBody();
+            log.error("支付宝开启代商户签约，确认事务异常: {}", body);
+            JSONObject object = JSONObject.parseObject(body);
+            throw new CzgException(object.getString(ERR_MESSAGE_KEY));
+        }
+    }
+
+    /**
+     * 构建 当面付参数
+     */
+    public static AlipayOpenAgentFacetofaceSignModel buildFaceToFaceModel(AggregateMerchantDto reqDto, String batchNo) {
+        AlipayOpenAgentFacetofaceSignModel signModel = new AlipayOpenAgentFacetofaceSignModel();
+        signModel.setBatchNo(batchNo);
+
+        MerchantBaseInfoDto baseInfo = reqDto.getMerchantBaseInfo();
+        LegalPersonInfoDto legalPersonInfo = reqDto.getLegalPersonInfo();
+        BusinessLicenceInfoDto licenceInfo = reqDto.getBusinessLicenceInfo();
+        StoreInfoDto storeInfo = reqDto.getStoreInfo();
+
+        signModel.setMccCode(baseInfo.getMccCode());
+        signModel.setRate("0.38");
+        signModel.setSignAndAuth(true);
+
+        signModel.setBusinessLicenseNo(licenceInfo.getLicenceNo());
+        signModel.setBusinessLicenseMobile(legalPersonInfo.getLegalPersonPhone());
+        signModel.setLongTerm(PayCst.LONG_TERM_DATE.equals(licenceInfo.getLicenceEndDate()));
+        signModel.setDateLimitation(licenceInfo.getLicenceStartDate());
+
+        signModel.setShopName(baseInfo.getShortName());
+
+        // 设置店铺地址
+        SignAddressInfo shopAddress = new SignAddressInfo();
+        shopAddress.setCountryCode("156");
+        shopAddress.setDistrictCode(storeInfo.getMercAreaCode());
+        shopAddress.setDetailAddress(storeInfo.getBusinessAddress());
+        shopAddress.setProvinceCode(storeInfo.getMercProvCode());
+        shopAddress.setCityCode(storeInfo.getMercCityCode());
+        signModel.setShopAddress(shopAddress);
+
+        return signModel;
+    }
+
+    public static void main(String[] args) {
+//        confirmRequest("2026010815384505500018243");
+        queryMerchantBatchStatus(null, "2026010815384505500018243");
+    }
+}
--- a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayReqUtils.java
+++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayReqUtils.java
@@ -1,224 +0,0 @@
-package com.czg.third.alipay;
-
-
-import com.alipay.api.AlipayApiException;
-import com.alipay.api.AlipayConfig;
-import com.alipay.api.DefaultAlipayClient;
-import com.alipay.api.domain.*;
-import com.alipay.api.request.AntMerchantExpandIndirectZftSimplecreateRequest;
-import com.alipay.api.response.AntMerchantExpandIndirectZftSimplecreateResponse;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author yjjie
- * @date 2026/1/5 13:46
- */
-public class AlipayReqUtils {
-    public static void main(String[] args) throws AlipayApiException {
-//        DefaultAlipayClient defaultAlipayClient = AlipayClient.getDefaultClient(null);
-//                AlipayClient alipayClient = new DefaultAlipayClient(getAlipayConfig());
-        DefaultAlipayClient defaultAlipayClient = new DefaultAlipayClient(getAlipayConfig());
-
-        // 构造请求参数以调用接口
-        AntMerchantExpandIndirectZftSimplecreateRequest request = new AntMerchantExpandIndirectZftSimplecreateRequest();
-        AntMerchantExpandIndirectZftSimplecreateModel model = new AntMerchantExpandIndirectZftSimplecreateModel();
-
-        // 设置商户编号
-        model.setExternalId("1052900599901941");
-
-        // 设置签约支付宝账户
-        model.setBindingAlipayLogonId("18434286340");
-
-        // 设置商户别名
-        model.setAliasName("一点点");
-
-        // 设置商户客服电话
-//        model.setServicePhone("0571-85022088");
-
-        // 设置商户联系人信息
-        ContactInfo contactInfos = new ContactInfo();
-        contactInfos.setIdCardNo("142725199902176419");
-//        contactInfos.setPhone("0571-85022088");
-        contactInfos.setName("王伟");
-        contactInfos.setMobile("18434286340");
-        contactInfos.setEmail("18434286340");
-        model.setContactInfos(contactInfos);
-
-        // 设置进件的二级商户名称
-        model.setName("王伟");
-
-        // 设置默认结算规则
-        DefaultSettleRule defaultSettleRule = new DefaultSettleRule();
-        defaultSettleRule.setDefaultSettleType("alipayAccount");
-        defaultSettleRule.setDefaultSettleTarget("18434286340");
-        model.setDefaultSettleRule(defaultSettleRule);
-
-        // 设置结算支付宝账号
-        model.setAlipayLogonId("18434286340");
-
-        // 设置结算银行卡信息
-        SettleCardInfo bizCards = new SettleCardInfo();
-        bizCards.setAccountInstName("招商银行");
-        bizCards.setBankCode("103290003044");
-        bizCards.setAccountType("DC");
-        bizCards.setUsageType("01");
-        bizCards.setAccountHolderName("王伟");
-        bizCards.setAccountInstCity("杭州市");
-        bizCards.setAccountInstId("CMB");
-        bizCards.setAccountNo("6214831259609102");
-        bizCards.setAccountBranchName("招商银行杭州高新支行");
-        bizCards.setAccountInstProvince("浙江省");
-        model.setBizCards(bizCards);
-
-        // 设置授权函
-        model.setLicenseAuthLetterImage("c6c0c7a1-b9d5-4e5d-b9d4-9eed39f00e65.jpg");
-
-        // 设置开票资料信息
-//        MerchantInvoiceInfo invoiceInfo = new MerchantInvoiceInfo();
-//        invoiceInfo.setMailTelephone("057162288888");
-//        invoiceInfo.setTaxPayerQualification("01");
-//        invoiceInfo.setAddress("浙江省杭州市西湖区西溪路蚂蚁金服");
-//        invoiceInfo.setAcceptElectronic(false);
-//        invoiceInfo.setTelephone("057162288888");
-//        invoiceInfo.setTitle("蚂蚁金服（杭州）信息技术有限公司");
-//        invoiceInfo.setMailName("张三");
-//        invoiceInfo.setAutoInvoice(true);
-//        invoiceInfo.setTaxPayerValid("19981011");
-//        invoiceInfo.setTaxNo("51010482542598631219");
-//        invoiceInfo.setBankName("中国银行");
-//        AddressInfo mailAddress = new AddressInfo();
-//        mailAddress.setAddress("万塘路18号黄龙时代广场B座");
-//        mailAddress.setDistrictCode("371002");
-//        mailAddress.setLatitude("60.270001");
-//        mailAddress.setCityCode("371000");
-//        mailAddress.setPoiid("B0FFIVU189");
-//        mailAddress.setProvinceCode("370000");
-//        mailAddress.setLongitude("120.760001");
-//        invoiceInfo.setMailAddress(mailAddress);
-//        invoiceInfo.setBankAccount("1234567812345678123");
-//        model.setInvoiceInfo(invoiceInfo);
-
-        // 设置商户使用服务
-        List<String> service = new ArrayList<String>();
-        service.add("当面付");
-        model.setService(service);
-
-        // 设置经营地址
-        AddressInfo businessAddress = new AddressInfo();
-        businessAddress.setAddress("万塘路18号黄龙时代广场B座");
-        businessAddress.setDistrictCode("371002");
-        businessAddress.setLatitude("60.270001");
-        businessAddress.setCityCode("371000");
-        businessAddress.setPoiid("B0FFIVU189");
-        businessAddress.setProvinceCode("370000");
-        businessAddress.setType("BUSINESS_ADDRESS");
-        businessAddress.setLongitude("120.760001");
-        model.setBusinessAddress(businessAddress);
-
-        // 设置门头照
-        model.setOutDoorImages("c6c0c7a1-b9d5-4e5d-b9d4-9eed39f00e65.jpg");
-
-        // 设置内景照
-        model.setInDoorImages("c6c0c7a1-b9d5-4e5d-b9d4-9eed39f00e65.jpg");
-
-        // 设置商户站点信息
-//        SiteInfo sites = new SiteInfo();
-//        sites.setIcpOrgName("支付宝（中国）网络技术有限公司");
-//        sites.setSiteType("01");
-//        sites.setSiteDomain("www.alipay.com");
-//        sites.setScreenshotImage("c6c0c7a1-b9d5-4e5d-b9d4-9eed39f00e65.jpg");
-//        sites.setRemark("备注说明");
-//        sites.setAuthLetterImage("c6c0c7a1-b9d5-4e5d-b9d4-9eed39f00e65.jpg");
-//        sites.setSiteName("XXX网站");
-//        sites.setMarket("豌豆荚");
-//        sites.setPassword("测试密码");
-//        sites.setDownload("https://itunes.apple.com/cn/app/id333206289?mt=8");
-//        sites.setTinyAppId("2021004105652035");
-//        sites.setSiteUrl("https://open.alipay.com");
-//        sites.setIcpServiceName("支付宝");
-//        sites.setRemarkImage("c6c0c7a1-b9d5-4e5d-b9d4-9eed39f00e65.jpg");
-//        sites.setAccount("测试账号");
-//        sites.setIcpNo("沪ICP备15027489号-2");
-//        sites.setStatus("ONLINE");
-//        model.setSites(sites);
-
-        // 设置商户类别码 mcc
-        model.setMcc("B0007");
-
-        // 设置商户行业资质图片
-        List<IndustryQualificationInfo> qualifications = new ArrayList<IndustryQualificationInfo>();
-        IndustryQualificationInfo qualifications0 = new IndustryQualificationInfo();
-        qualifications0.setIndustryQualificationImage("c6c0c7a1-b9d5-4e5d-b9d4-9eed39f00e65.jpg");
-        qualifications0.setIndustryQualificationType("323");
-        qualifications.add(qualifications0);
-        model.setQualifications(qualifications);
-
-        // 设置补充证件号
-        model.setAdditionalCertNo("9133010608210550XR");
-
-        // 设置补充证件类型
-        model.setAdditionalCertType("201");
-
-        // 设置补充证件图片
-        model.setAdditionalCertImage("c6c0c7a1-b9d5-4e5d-b9d4-9eed39f00e65.jpg");
-
-        // uid参数未来计划废弃，存量商户可继续使用，新商户请使用openid。请根据应用-开发配置-openid配置选择支持的字段。
-        // model.setInfoSourceUid("2088111122223333");
-
-        // 设置（平替原来的info_source_uid字段
-//        model.setInfoSourceOpenId("074a1CcTG1LelxKe4xQC0zgNdId0nxi95b5lsNpazWYoCo5");
-
-        // uid参数未来计划废弃，存量商户可继续使用，新商户请使用openid。请根据应用-开发配置-openid配置选择支持的字段。
-        // model.setOverseaSettleAccount("2088111122223333");
-
-        // 设置（平替原来的oversea_settle_open_id字段
-//        model.setOverseaSettleOpenId("074a1CcTG1LelxKe4xQC0zgNdId0nxi95b5lsNpazWYoCo5");
-
-        // 设置二级商户与服务商的签约时间
-        model.setSignTimeWithIsv("2015-04-15");
-
-        // 设置代扣产品信息
-        ZFTWithholdingInfo zftWithholdingInfo = new ZFTWithholdingInfo();
-        zftWithholdingInfo.setWithholdingServiceFeatureName("GENERAL_WITHHOLDING_P");
-        zftWithholdingInfo.setSignScene("DEFAULT");
-        model.setZftWithholdingInfo(zftWithholdingInfo);
-
-        // 设置交易场景
-        List<String> tradeScene = new ArrayList<String>();
-        tradeScene.add("TINY_APP");
-        model.setTradeScene(tradeScene);
-
-        request.setBizModel(model);
-        // 第三方代调用模式下请设置app_auth_token
-        // request.putOtherTextParam("app_auth_token", "<-- 请填写应用授权令牌 -->");
-
-        AntMerchantExpandIndirectZftSimplecreateResponse response = defaultAlipayClient.execute(request);
-        System.out.println(response.getBody());
-
-        if (response.isSuccess()) {
-            System.out.println("调用成功");
-        } else {
-            System.out.println("调用失败");
-            // sdk版本是"4.38.0.ALL"及以上,可以参考下面的示例获取诊断链接
-            // String diagnosisUrl = DiagnosisUtils.getDiagnosisUrl(response);
-            // System.out.println(diagnosisUrl);
-        }
-    }
-
-    private static AlipayConfig getAlipayConfig() {
-        String privateKey  = "MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQD48HaUoV7OH7os+9L01kHgxzwIhJick4OkFq4aHsntsXEJ  J3gedhuEZtV8oHKZ30DPW12IJ4S8NXtpr8OWaqrAPFonf4wVaRY1d0yIAea57kfLEn9oOEEy4FzARgMNDkyxC+/3OUdGbLHpTjfVX3gusXsEhUDy1/WewihAkoNYF37+W3W/uVLzeWoPq0EcUbRv/G/t/p6gL69ltsMAiVFG4Q/Yk24YAN6lYgBPNLXUEwQ1Q+T+1omjfavHgvarKOp33z3JOUH+aGOmDsJ5Y9gyGtJzOCipAd8Zcv+T1ygsEzZYO1/gzcbPnfO1ShqStCHzssuw8FBVx2JdfQKXKMMNAgMBAAECggEAVTrO/pg5Q00titU1Jspsh67u6OOs9H605Ws2dI7yB8VmtAGlaJh7V1t14FN2qSP8poHbhhAxq9aLyGV7C3a9u09udnN+3J28EtYjh7VO732bavWMVXxdJjQWzWWrCb9JlpxFrlkYBA6W4w/6ob0sAqCVQ7jzwbEa0R4cde8ztOa5nysKSfr4YTSs0gqvoiC6fmg8eiRJraEQBoYz9VkKFtOhhh/4w5FhVcYQ2gQvZ3kK3QVuD1eJIQKlCtz8qaox9lXKDiZT4SCmnKshdUL0u5TYIcYeBjZmhJz0Q50KHcpZrCs5y7I0+vRBH3hU+TKSQt7ureymwhbwWMHScLV2gQKBgQD+58SHXhr5M8NGagAmTdsgmCnNv2kOYMd4STyPMY10SVwCv1Bk808ZuP+7e558J1b5/OuDLI5dLq6xrZ/1wLv1G++XqxI00hlFuWS5mUGJVcXotT1mw20rVeUILc7Qe3mLvbMGgfyKf4A7Qa5SSZ4bDeDTJYaFxyiQ281hMzDuPQKBgQD6AiL/Na2/uPH4CG6juwpjYvYVUcjK+7gbRwf3wWsWMpk90Z4ju2iUiP5c1J/oK9P+1T3PIr6M4Xjza8JJj+r9KC/PVB0gBv6vVM96cDpKUEy/UMpcn/T81vqj/Z+WEOODU8Ms6NiTTm+u9ldvpCjbu0u8M+9c0JeIyadJvSTFEQKBgQCsxmFyM3nq8YfpgU2qqNjfBeRH3faSVUy+nj1a/YZYjKS+A/i1BCnYUImeBVNN6chNV342ggvY4xxruDiU9Vcw8wd58O09Oi8BEIFSP6upL6cebUI6Fjo3xlegLJRiwV6INkNTJOYM5hD/mSxUACwXQFfkJipBINXBIgraWD1RLQKBgQCj49axWq0F6+WjZVOyPaD3uh37p9trRUxRhWTxw3fB23WdktaKMgbCqHOmwzP4bRLSEVQtf2dOz1gMqu14b8HqJvgAf/F/11YJ9hz09LEhmjZVjE68HZfqT7uK2W5OX8/lfXmK7TFcj6SjG5YB96lZMhTZ0WnufEd6QkdKDZYXIQKBgQD9GDTcIMbFwbEaKHnfZaTD3f876EGRgsgrCxwdEk7LBCRPwWo7yI929M4psIlpNwNeiyjBkBunWIVkpznp6qPtJqagIPUYesU4f5v6/okq5wcpaNKSkWbIvWVLaLGOiA1aeGJtbpMpyClbSr52puHpRRdvAiIEQ74yYh0JX8q96g==";
-        String alipayPublicKey = "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiQkrz+emAuS1mB3KKDOMmAZRd/BlPbh7fAIHAqAj1+QCZNcV3o2BTLIIqnuKpSlFXDG3uDzp2VsBxcizXuBbFyPGylnD9CgCj5abyh3+FIHPAZ2IM3TtpqImZ0TSPGXrMli4Nir7MvZktgccCqQKCC4o6iaDGz+UwWwJUIPna8fm2tiTZ+KH150CZbKVj4ZGNpBh5XSV/1dRgyQIV9D/EwSbkZ0n6VgKQLJBi0C2UE3QB17aL1Ir6+gDXIDbknN8O7GUD3aMGdThYdSRUb5wp9CZ5qfV7vCS/CgaRo38nhH3NOzkTL+7v0m1ZDHPmqEkn9VzZN6sCQdL7PoAOjHOCwIDAQAB";
-        AlipayConfig alipayConfig = new AlipayConfig();
-        alipayConfig.setServerUrl("https://openapi.alipay.com/gateway.do");
-        alipayConfig.setAppId("2021004174605036");
-        alipayConfig.setPrivateKey(privateKey);
-        alipayConfig.setFormat("json");
-        alipayConfig.setAlipayPublicKey(alipayPublicKey);
-        alipayConfig.setCharset("UTF-8");
-        alipayConfig.setSignType("RSA2");
-        return alipayConfig;
-    }
-
-}
--- a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/dto/config/AlipayConfigDto.java
+++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/dto/config/AlipayConfigDto.java
@@ -34,10 +34,15 @@ public class AlipayConfigDto {

    public static AlipayConfigDto getDefaultConfig() {
        return new AlipayConfigDto()
-                .setAppId("2021004174605036")
-                .setPrivateKey("MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQD48HaUoV7OH7os+9L01kHgxzwIhJick4OkFq4aHsntsXEJ  J3gedhuEZtV8oHKZ30DPW12IJ4S8NXtpr8OWaqrAPFonf4wVaRY1d0yIAea57kfLEn9oOEEy4FzARgMNDkyxC+/3OUdGbLHpTjfVX3gusXsEhUDy1/WewihAkoNYF37+W3W/uVLzeWoPq0EcUbRv/G/t/p6gL69ltsMAiVFG4Q/Yk24YAN6lYgBPNLXUEwQ1Q+T+1omjfavHgvarKOp33z3JOUH+aGOmDsJ5Y9gyGtJzOCipAd8Zcv+T1ygsEzZYO1/gzcbPnfO1ShqStCHzssuw8FBVx2JdfQKXKMMNAgMBAAECggEAVTrO/pg5Q00titU1Jspsh67u6OOs9H605Ws2dI7yB8VmtAGlaJh7V1t14FN2qSP8poHbhhAxq9aLyGV7C3a9u09udnN+3J28EtYjh7VO732bavWMVXxdJjQWzWWrCb9JlpxFrlkYBA6W4w/6ob0sAqCVQ7jzwbEa0R4cde8ztOa5nysKSfr4YTSs0gqvoiC6fmg8eiRJraEQBoYz9VkKFtOhhh/4w5FhVcYQ2gQvZ3kK3QVuD1eJIQKlCtz8qaox9lXKDiZT4SCmnKshdUL0u5TYIcYeBjZmhJz0Q50KHcpZrCs5y7I0+vRBH3hU+TKSQt7ureymwhbwWMHScLV2gQKBgQD+58SHXhr5M8NGagAmTdsgmCnNv2kOYMd4STyPMY10SVwCv1Bk808ZuP+7e558J1b5/OuDLI5dLq6xrZ/1wLv1G++XqxI00hlFuWS5mUGJVcXotT1mw20rVeUILc7Qe3mLvbMGgfyKf4A7Qa5SSZ4bDeDTJYaFxyiQ281hMzDuPQKBgQD6AiL/Na2/uPH4CG6juwpjYvYVUcjK+7gbRwf3wWsWMpk90Z4ju2iUiP5c1J/oK9P+1T3PIr6M4Xjza8JJj+r9KC/PVB0gBv6vVM96cDpKUEy/UMpcn/T81vqj/Z+WEOODU8Ms6NiTTm+u9ldvpCjbu0u8M+9c0JeIyadJvSTFEQKBgQCsxmFyM3nq8YfpgU2qqNjfBeRH3faSVUy+nj1a/YZYjKS+A/i1BCnYUImeBVNN6chNV342ggvY4xxruDiU9Vcw8wd58O09Oi8BEIFSP6upL6cebUI6Fjo3xlegLJRiwV6INkNTJOYM5hD/mSxUACwXQFfkJipBINXBIgraWD1RLQKBgQCj49axWq0F6+WjZVOyPaD3uh37p9trRUxRhWTxw3fB23WdktaKMgbCqHOmwzP4bRLSEVQtf2dOz1gMqu14b8HqJvgAf/F/11YJ9hz09LEhmjZVjE68HZfqT7uK2W5OX8/lfXmK7TFcj6SjG5YB96lZMhTZ0WnufEd6QkdKDZYXIQKBgQD9GDTcIMbFwbEaKHnfZaTD3f876EGRgsgrCxwdEk7LBCRPwWo7yI929M4psIlpNwNeiyjBkBunWIVkpznp6qPtJqagIPUYesU4f5v6/okq5wcpaNKSkWbIvWVLaLGOiA1aeGJtbpMpyClbSr52puHpRRdvAiIEQ74yYh0JX8q96g==")
+                .setAppId("2021006121646825")
+                .setPrivateKey("MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCz3FkdffxZibdwis9W7eOW1dEjGAbSvRDL2ikfeCIW5KZNoIjUqxI0mIoUlLRRKO71QLHZS1Vb2aJp8jeOAqIPa8e76HTneQEzk3FGA8gpraSGvbadHWzvxnmYKsts1TBiEZQL82ySJXhQTJvZ6jyDM7s6wHHUnrH+Qi29QpppQ1sxsoJeCtajUgRg3btD6XbBcyFAX3pzM56Kw9eaIjZoD8WToZOM/Y3sqNL2uo8lLqcIpTrI7Pq5ZOspmBQ+t8v3rS9IdDZZMvd0trzS67AXwHz8rKPBT/lL1A4iHnXCHUvktusX1fPs3/RGY/a7PIddaBLnfY0GcueE16K7QcrXAgMBAAECggEAbSdT2eckp75BWoaTcGEs1tRqeM7TDT/6moyKmnOQ1K3tE31SrSYpBUxxuC3LBNo/sw2RIZtrcTOyMnPyLTgB3DP/4lUf5X51MTTQ8LnI1ypvh+pIki9Sdm3QS33lOOZk149tdpdDk6ozyx/DEcvq74EMpoo2SuAIi5LkKVDrXuehvGA/WeXtpmuPgqRFdIA+JBlA3knHk5XEQY/k2Y31gq5oCwNL9iT9OAZqVkukE6EnvCXE9t2rAV4/snYilaf/UaO+ktgEwSbPBQ8YKlovDAarMBbGtgr6E174A9djlPyR+W/fgx8rlTwSWtieb9MkO8LN3KSxgVs0kY5U8OHg8QKBgQDljJq9kTFHare+W/fAXdUy3tJprfNQCAii6s+GuDfTQiviVQDtWmdtHAN+xU3to7MepvVhwHsqtQnZXKTtZuwwxn82FNl7A5RYD3GVFW+wG6AsGLIdESrWxySoL6Kx8QmNpMEVg8acT/ywzW/RnUXS5vU7GIi8GA0vtyBo24R9KQKBgQDIlf/R9+iNk9oXlbB/k4um9eVvBBS7l5cx4E5Id5Dpp4kGZfPZEa7oDsEUstZZM9mgQLJK/noNWbcf0+BohCR5ux7SC12qIoxwN3k4BzTDqrS8BzFuVVp5PELUsf/uCbRn05iMzpiDUhj3Vde04wvjHYIobfKlZO2HeSWXCpUH/wKBgQC8wSuU6ck90pEY5QMKmZ3wYK1g3PsQOirv3Gmde+nbu7PePsuuYQJfBAQTwCZeXJezgtKP+PjOm2Nn6vhrhpB9YxvD2s0ijET1TG23i5L1myHQYNZFdJJnXgXUjqcX7v5ODMYA7QTqEBPXRnbGRK7fx66rU3dMQ/LD46+wyaFeUQKBgA4QTk53dkuu6SSsLyLSwoDjTsHY5Gc+urAZjQORtoxbXcUgEtfOYJgOqMT9wP+iHgkZYCbX7tDO0IMfxOUvFqueTgvmFhwergAUM6CVCMMLTf689l9JBr3nVrw4+rvC3G5HLLP6rEDQ2cVFtIkPPj8fS4fwJYopKGpOOS9843QbAoGBAMoHH8LqoZ50FLsospx/hJe24Cd8wCgQTXSa/hMqNZ1999JDhftMt7R0ZdB1he2LReACe0K9ntBU4H4u225zZ3wZlyOfoyerAHuLK/ysNlgIIzblZlOxbBJ64Kul8leXzlYy3tOZuZ997KqBcWPCE3LUBBNvM6E3blJUnlmJAVoi")
                .setAlipayPublicKey("MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiQkrz+emAuS1mB3KKDOMmAZRd/BlPbh7fAIHAqAj1+QCZNcV3o2BTLIIqnuKpSlFXDG3uDzp2VsBxcizXuBbFyPGylnD9CgCj5abyh3+FIHPAZ2IM3TtpqImZ0TSPGXrMli4Nir7MvZktgccCqQKCC4o6iaDGz+UwWwJUIPna8fm2tiTZ+KH150CZbKVj4ZGNpBh5XSV/1dRgyQIV9D/EwSbkZ0n6VgKQLJBi0C2UE3QB17aL1Ir6+gDXIDbknN8O7GUD3aMGdThYdSRUb5wp9CZ5qfV7vCS/CgaRo38nhH3NOzkTL+7v0m1ZDHPmqEkn9VzZN6sCQdL7PoAOjHOCwIDAQAB")
-                .setDomain("https://openapi.alipay.com/gateway.do");
+                .setDomain("https://openapi.alipay.com");
+//        return new AlipayConfigDto()
+//                .setAppId("2021004174605036")
+//                .setPrivateKey("MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQD48HaUoV7OH7os+9L01kHgxzwIhJick4OkFq4aHsntsXEJ  J3gedhuEZtV8oHKZ30DPW12IJ4S8NXtpr8OWaqrAPFonf4wVaRY1d0yIAea57kfLEn9oOEEy4FzARgMNDkyxC+/3OUdGbLHpTjfVX3gusXsEhUDy1/WewihAkoNYF37+W3W/uVLzeWoPq0EcUbRv/G/t/p6gL69ltsMAiVFG4Q/Yk24YAN6lYgBPNLXUEwQ1Q+T+1omjfavHgvarKOp33z3JOUH+aGOmDsJ5Y9gyGtJzOCipAd8Zcv+T1ygsEzZYO1/gzcbPnfO1ShqStCHzssuw8FBVx2JdfQKXKMMNAgMBAAECggEAVTrO/pg5Q00titU1Jspsh67u6OOs9H605Ws2dI7yB8VmtAGlaJh7V1t14FN2qSP8poHbhhAxq9aLyGV7C3a9u09udnN+3J28EtYjh7VO732bavWMVXxdJjQWzWWrCb9JlpxFrlkYBA6W4w/6ob0sAqCVQ7jzwbEa0R4cde8ztOa5nysKSfr4YTSs0gqvoiC6fmg8eiRJraEQBoYz9VkKFtOhhh/4w5FhVcYQ2gQvZ3kK3QVuD1eJIQKlCtz8qaox9lXKDiZT4SCmnKshdUL0u5TYIcYeBjZmhJz0Q50KHcpZrCs5y7I0+vRBH3hU+TKSQt7ureymwhbwWMHScLV2gQKBgQD+58SHXhr5M8NGagAmTdsgmCnNv2kOYMd4STyPMY10SVwCv1Bk808ZuP+7e558J1b5/OuDLI5dLq6xrZ/1wLv1G++XqxI00hlFuWS5mUGJVcXotT1mw20rVeUILc7Qe3mLvbMGgfyKf4A7Qa5SSZ4bDeDTJYaFxyiQ281hMzDuPQKBgQD6AiL/Na2/uPH4CG6juwpjYvYVUcjK+7gbRwf3wWsWMpk90Z4ju2iUiP5c1J/oK9P+1T3PIr6M4Xjza8JJj+r9KC/PVB0gBv6vVM96cDpKUEy/UMpcn/T81vqj/Z+WEOODU8Ms6NiTTm+u9ldvpCjbu0u8M+9c0JeIyadJvSTFEQKBgQCsxmFyM3nq8YfpgU2qqNjfBeRH3faSVUy+nj1a/YZYjKS+A/i1BCnYUImeBVNN6chNV342ggvY4xxruDiU9Vcw8wd58O09Oi8BEIFSP6upL6cebUI6Fjo3xlegLJRiwV6INkNTJOYM5hD/mSxUACwXQFfkJipBINXBIgraWD1RLQKBgQCj49axWq0F6+WjZVOyPaD3uh37p9trRUxRhWTxw3fB23WdktaKMgbCqHOmwzP4bRLSEVQtf2dOz1gMqu14b8HqJvgAf/F/11YJ9hz09LEhmjZVjE68HZfqT7uK2W5OX8/lfXmK7TFcj6SjG5YB96lZMhTZ0WnufEd6QkdKDZYXIQKBgQD9GDTcIMbFwbEaKHnfZaTD3f876EGRgsgrCxwdEk7LBCRPwWo7yI929M4psIlpNwNeiyjBkBunWIVkpznp6qPtJqagIPUYesU4f5v6/okq5wcpaNKSkWbIvWVLaLGOiA1aeGJtbpMpyClbSr52puHpRRdvAiIEQ74yYh0JX8q96g==")
+//                .setAlipayPublicKey("MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAiQkrz+emAuS1mB3KKDOMmAZRd/BlPbh7fAIHAqAj1+QCZNcV3o2BTLIIqnuKpSlFXDG3uDzp2VsBxcizXuBbFyPGylnD9CgCj5abyh3+FIHPAZ2IM3TtpqImZ0TSPGXrMli4Nir7MvZktgccCqQKCC4o6iaDGz+UwWwJUIPna8fm2tiTZ+KH150CZbKVj4ZGNpBh5XSV/1dRgyQIV9D/EwSbkZ0n6VgKQLJBi0C2UE3QB17aL1Ir6+gDXIDbknN8O7GUD3aMGdThYdSRUb5wp9CZ5qfV7vCS/CgaRo38nhH3NOzkTL+7v0m1ZDHPmqEkn9VzZN6sCQdL7PoAOjHOCwIDAQAB")
+//                .setDomain("https://openapi.alipay.com/gateway.do");
 //        return new AlipayConfigDto()
 //                .setAppId("2021004145625815")
 //                .setPrivateKey("MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCAjDBuS8K/IJb9ui+KuNm/sTUdEiaji4BNpZ92avO1N5JpNlGmac6ec4p3tNFT950sBLcQkClcUpQxUHQzAT6DYNNXOKyvfI/EmcqwCw6PaMNLs/8cV//J2WWZBUhLaOsjKurpm9/3W5MnTh4BGxIfBoeBMA8f8K3BgKdmyKtvIEV2h2cyjsMskdn+g6oNZcmWcms0pvpPHyH46mRaGFhpp0v19wX3WsamGldh1L2VntmaDN3C2XbSrXv90XYp5bEUqwTbLwXpMAlzTibF56d/iqv9oYi8cpAKougUFLOymnbutLNs2tLrEDSFwHcmG2/wbZHybZyYcIgFgv4arf+tAgMBAAECggEAf7hKKlw1y6Z6vvAtalxNZUuRZSfyog3p1bwYWxTavZPQcZ7Zs0lvVDmiO1u5m/7q96BbryY9IhCeUv0H5uF2lhwu/3s9AEL3qTPQkeb6eXxyhhX6A9RfPdM1Qbtg4CQHdHKg4qjP9znSVHwmDZ0y/QaEvdPdQzPjv92u9c2tn4N4x6XyBYcU5gzxiJNnIugCmBgcJo/3H2fgV+XXEhORPvy5of9b4oATHEaLS/8dAS2wuOjhzaGS4MXp3VkXn3XaYjwSzaL03qYWA+xm+aO5sJv8bmqZW7sNVck5o3sPo7cQ4VkBFVzyrRdmJcxcSRJ9MsB9JsrhoKI8pgaXrVie4QKBgQDU2vai0lpBIK/0jzRpPNoqdT8lnafnnWni8nU4kfAh+gCLi+HBPhQRT0kv4unQc2q2/gALE7sgZVO00JGY5a3R0orsojPoUSZlpypGW7GGqKy576NHn0nw4o/PdfysT92VWgt1hlfTf6qfCDhfE9APU+RGvlSWXcT8nxVel3iUaQKBgQCamoJN6+4v+chJvL2nqV8NVVRLp0vDIHxs1QOtKwUodx8Qp1D6CJYtavCXn8aNUFVNQJPJ7TQPpJjXP2rI4SN01weDwx+I+wh8PBGHV6/234R+6TvFgY1PrYgCdfNP4i/E7B4uyEhAxdU73PB8qkqRAeJGok05p7oG71KCOBiYpQKBgEZfGflcuDAeAW5GRhqg3rP4zWa/R7qgZVh9tll8jjp9b96y4XFE99d9MgId8BVVgyt6sEL5Q/2C4ni+F9TH4n6jMADp42VkJuCmsqhOOlP9whU67+2G8Sgtj0QUivPg964f9ffl8XVgGOW5DwIIB9p5btggptCLscufQK5kP545AoGADBvf6tR4wl8w9b2HqTMV08iEIqzGvVC1Dh0c/Zop/EJgN4CzUfIMOSBwGaAVAApzs+pD6QPgGP2OTwWTioo/qa4R05sbxDHNN1XJFa2jhZV6HiqMWOrNs5jm1zJ/zRjtHuJTdtyO9CvKiLbESy9XScY4/8lEfSiK5HIoJzTXkFUCgYAkYkvkW6psJpWj05XWq44UN0n6QOU/Igl35Um/iuOMVhsTmIt09STQVTuzJzfH82+sCqoRsD1blE5unKNUC1DK77aNKTv3Z0dxN9R7FAyfZRiYQXTrbBPBqWjay6FCNxn8e8UsJN4Z6FIV2LGlQI114krSap1MALKLVvnld0NaUQ==")
--- a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatEntryManager.java
+++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatEntryManager.java
@@ -42,15 +42,15 @@ public class WechatEntryManager {
     * 查询商户进件状态
     *
     * @param configDto 配置信息
-     * @param merchantCode   自系统的商户编号
+     * @param applyId   自系统的商户编号
     * @return 进件状态
     */
-    public static QueryStatusResp queryMerchantEntryStatus(WechatPayConfigDto configDto, String merchantCode) {
+    public static QueryStatusResp queryMerchantEntryStatus(WechatPayConfigDto configDto, String applyId) {
        QueryStatusResp queryStatusResp = new QueryStatusResp();
        queryStatusResp.setPlatform(PayCst.Platform.WECHAT);
-        queryStatusResp.setMerchantCode(merchantCode);
+        queryStatusResp.setMerchantCode(applyId);

-        String resp = WechatReqUtils.getReq(configDto, "/v3/applyment4sub/applyment/business_code/" + merchantCode, Map.of());
+        String resp = WechatReqUtils.getReq(configDto, "/v3/applyment4sub/applyment/applyment_id/" + applyId, Map.of());
        JSONObject object = JSONObject.parseObject(resp);
        JSONObject data = object.getJSONObject("data");
        if (data == null) {
--- a/cash-sdk/aggregation-pay/src/main/java/com/czg/utils/UploadFileUtil.java
+++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/utils/UploadFileUtil.java
@@ -2,10 +2,14 @@ package com.czg.utils;

 import lombok.extern.slf4j.Slf4j;

+import java.io.File;
+import java.io.IOException;
 import java.net.URI;
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.util.regex.Pattern;

 /**
@@ -33,6 +37,21 @@ public class UploadFileUtil {
        return "png";
    }

+    /**
+     * 根据图片URL获取图片文件
+     *
+     * @param url 图片URL
+     * @return 图片文件
+     */
+    public static File getFileByUrl(String url) throws IOException {
+        byte[] bytes = downloadImage(url);
+
+        Path tempFile = Files.createTempFile("image_", "." + extractImageExtension(url));
+        Files.write(tempFile, bytes);
+
+        return tempFile.toFile();
+    }
+
    /**
     * 下载图片
     * @param url 图片地址
--- a/cash-service/account-service/src/main/java/com/czg/service/account/mapper/QuickMenuMapper.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/mapper/QuickMenuMapper.java
@@ -1,14 +0,0 @@
-package com.czg.service.account.mapper;
-
-import com.mybatisflex.core.BaseMapper;
-import com.czg.account.entity.QuickMenu;
-
-/**
- * 悬浮窗配置 映射层。
- *
- * @author ww
- * @since 2025-12-29
- */
-public interface QuickMenuMapper extends BaseMapper<QuickMenu> {
-
-}
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallTableServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/CallTableServiceImpl.java
@@ -14,9 +14,9 @@ import com.czg.config.RedisCst;
 import com.czg.constants.ParamCodeCst;
 import com.czg.exception.CzgException;
 import com.czg.resp.CzgResult;
-import com.czg.service.RedisService;
 import com.czg.service.account.mapper.CallQueueMapper;
 import com.czg.service.account.mapper.CallTableMapper;
+import com.czg.service.account.util.FunUtil;
 import com.czg.service.account.util.WechatMiniMsgUtil;
 import com.czg.system.dto.SysParamsDTO;
 import com.czg.system.service.SysParamsService;
@@ -51,9 +51,9 @@ public class CallTableServiceImpl extends ServiceImpl<CallTableMapper, CallTable
    @Resource
    private ShopUserService shopUserService;
    @Resource
-    private StringRedisTemplate stringRedisTemplate;
+    private FunUtil funUtil;
    @Resource
-    private RedisService redisService;
+    private StringRedisTemplate stringRedisTemplate;
    @Resource
    private ShopInfoService shopInfoService;
    @Resource
@@ -228,13 +228,13 @@ public class CallTableServiceImpl extends ServiceImpl<CallTableMapper, CallTable
    }

    private String getCallNumber(Long shopId, CallTable callTable) {
-        return redisService.runFunAndCheckKey(() -> {
+        return funUtil.runFunAndCheckKey(() -> {
            String callNumKey = RedisCst.getTableCallNumKey(shopId, callTable.getId());
            String value = stringRedisTemplate.opsForValue().get(callNumKey);
            AtomicReference<String> newVal = new AtomicReference<>("");
            // 初始化
            if (StrUtil.isBlank(value)) {
-                Boolean setFlag = RedisService.runFunAndRetry(() -> stringRedisTemplate.opsForValue().setIfAbsent(callNumKey, callTable.getStart().toString()), flag -> !flag,
+                Boolean setFlag = FunUtil.runFunAndRetry(() -> stringRedisTemplate.opsForValue().setIfAbsent(callNumKey, callTable.getStart().toString()), flag -> !flag,
                        _ -> newVal.set(stringRedisTemplate.opsForValue().get(callNumKey)));

                if (setFlag) {
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/QuickMenuServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/QuickMenuServiceImpl.java
@@ -1,18 +0,0 @@
-package com.czg.service.account.service.impl;
-
-import com.mybatisflex.spring.service.impl.ServiceImpl;
-import com.czg.account.entity.QuickMenu;
-import com.czg.account.service.QuickMenuService;
-import com.czg.service.account.mapper.QuickMenuMapper;
-import org.springframework.stereotype.Service;
-
-/**
- * 悬浮窗配置 服务层实现。
- *
- * @author ww
- * @since 2025-12-29
- */
-@Service
-public class QuickMenuServiceImpl extends ServiceImpl<QuickMenuMapper, QuickMenu> implements QuickMenuService{
-
-}
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopInfoServiceImpl.java
@@ -99,7 +99,7 @@ public class ShopInfoServiceImpl extends ServiceImpl<ShopInfoMapper, ShopInfo> i
        if (shopInfo == null) {
            throw new CzgException("店铺不存在");
        }
-        if (shopInfo.getExpireTime() != null && (LocalDateTime.now().isAfter(shopInfo.getExpireTime()))) {
+        if (shopInfo.getExpireTime() != null && (DateUtil.date().toLocalDateTime().isAfter(shopInfo.getExpireTime()))) {
            throw new CzgException("店铺已过期，请联系商家");
        }
        if (SystemConstants.OneZero.ZERO == shopInfo.getOnSale() || shopInfo.getStatus() != SystemConstants.OneZero.ONE) {
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java
@@ -22,7 +22,6 @@ import com.czg.market.vo.InviteUserVO;
 import com.czg.market.vo.MemberConfigVO;
 import com.czg.order.entity.OrderInfo;
 import com.czg.service.account.mapper.ShopUserMapper;
-import com.czg.utils.FunUtils;
 import com.czg.utils.PageUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -62,7 +61,6 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
    private MemberLevelConfigService memberLevelConfigService;
    @DubboReference
    private TbMemberConfigService memberConfigService;
-
    private ShopUser getUserInfo(Long shopUserId) {
        ShopUser shopUser = queryChain().eq(ShopUser::getId, shopUserId).one();
        if (shopUser == null) {
@@ -242,13 +240,9 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
            shopUser.setBirthDay(null);
        }
        shopUser.setNickName(userInfo.getNickName());
-//        if (shopUser.getJoinTime() == null) {
-//            shopUser.setJoinTime(LocalDateTime.now());
-//        }
-        boolean b = saveOrUpdate(shopUser);
-        if (b) {
-            FunUtils.transactionSafeRun(() -> memberConfigService.joinMemberByCondition(shopId, userId, shopUser));
+        if (shopUser.getJoinTime() == null) {
+            shopUser.setJoinTime(LocalDateTime.now());
        }
-        return b;
+        return saveOrUpdate(shopUser);
    }
 }
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UShopUserServiceImpl.java
@@ -14,7 +14,6 @@ import com.czg.market.entity.MkPointsUser;
 import com.czg.market.entity.MkShopCouponRecord;
 import com.czg.market.service.MkPointsUserService;
 import com.czg.market.service.MkShopCouponRecordService;
-import com.czg.market.service.TbMemberConfigService;
 import com.czg.resp.CzgResult;
 import com.czg.service.RedisService;
 import com.czg.service.account.mapper.ShopConfigMapper;
--- a/cash-service/account-service/src/main/java/com/czg/service/account/util/FunUtil.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/util/FunUtil.java
@@ -0,0 +1,100 @@
+package com.czg.service.account.util;
+
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.script.DefaultRedisScript;
+import org.springframework.stereotype.Component;
+
+import java.util.Collections;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+/**
+ * @author Administrator
+ */
+@Slf4j
+@Component
+public class FunUtil {
+    @Resource
+    private  RedisTemplate<String, Object> redisTemplate;
+    public static int retryCount = 5;
+
+    /**
+     * 执行任务并保证锁唯一
+     * @param supplier 业务逻辑
+     * @param lockKey Redis锁的Key
+     * @return 业务逻辑返回值
+     */
+    public <T> T runFunAndCheckKey(Supplier<T> supplier, String lockKey) {
+        String lockValue = String.valueOf(System.nanoTime() + Thread.currentThread().threadId());
+        try {
+            // 尝试获取锁，超时时间 5 秒，防止死锁
+            boolean lock = Boolean.TRUE.equals(redisTemplate.opsForValue().setIfAbsent(lockKey, lockValue, 5, TimeUnit.SECONDS));
+            int count = 0;
+            // 初始等待 10ms
+            int retryDelay = 10;
+
+            while (!lock) {
+                // 最多重试 10 次，大约 10 秒
+                if (count++ > 50) {
+                    throw new RuntimeException("系统繁忙, 稍后再试");
+                }
+                Thread.sleep(retryDelay);
+                // 指数退避，最大等待 200ms
+                retryDelay = Math.min(retryDelay * 2, 200);
+                lock = Boolean.TRUE.equals(redisTemplate.opsForValue().setIfAbsent(lockKey, lockValue, 5, TimeUnit.SECONDS));
+            }
+
+            // 执行任务
+            return supplier.get();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new RuntimeException("线程被中断", e);
+        } catch (Exception e) {
+            log.error("执行出错：{}", e.getMessage(), e);
+            throw e;
+        } finally {
+            // 释放锁（使用 Lua 脚本确保原子性）
+            unlock(lockKey, lockValue);
+        }
+    }
+
+    /**
+     * 使用 Lua 脚本确保释放锁的原子性
+     * @param lockKey 锁的 Key
+     * @param lockValue 当前线程的锁值
+     */
+    private void unlock(String lockKey, String lockValue) {
+        String luaScript =
+                "if redis.call('get', KEYS[1]) == ARGV[1] then " +
+                        "return redis.call('del', KEYS[1]) " +
+                        "else return 0 end";
+        redisTemplate.execute(new DefaultRedisScript<>(luaScript, Long.class),
+                Collections.singletonList(lockKey), lockValue);
+    }
+
+    public static <T, R> R runFunAndRetry(
+            Supplier<R> function,
+            Function<R, Boolean> check, Consumer<R> errFun) {
+        log.info("工具类开始执行函数");
+        R result = function.get();
+        boolean flag = check.apply(result);
+
+        log.info("执行结果: {}", result);
+
+        while (flag && retryCount-- > 0) {
+            log.info("执行函数失败, 剩余尝试次数{}", retryCount);
+            result = function.get();
+            log.info("执行结果: {}", result);
+            flag = check.apply(result);
+        }
+
+        if (flag) {
+            errFun.accept(result);
+        }
+        return result;
+    }
+}
--- a/cash-service/account-service/src/main/resources/mapper/QuickMenuMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/QuickMenuMapper.xml
@@ -1,7 +0,0 @@
-<?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.czg.service.account.mapper.QuickMenuMapper">
-
-</mapper>
--- a/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/ShopUserMapper.xml
@@ -98,7 +98,7 @@
        <if test="amount != null">
            AND a.amount >= #{amount}
        </if>
-        group by a.id
+
        ORDER BY a.create_time DESC
    </select>
    <select id="selectVipCard_COUNT" resultType="java.lang.Long">
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkDistributionUserServiceImpl.java
@@ -85,6 +85,8 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
    private ShopUserService shopUserService;
    @DubboReference
    private UserInfoService userInfoService;
+    @DubboReference
+    private OrderPaymentService orderPaymentService;
    @Resource
    private OrderInfoService orderInfoService;
    @DubboReference
@@ -704,16 +706,6 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
        });
    }

-    @Transactional
-    @Override
-    public void distributionUserAmount(MkDistributionFlow item, OrderInfo orderInfo) {
-        ShopUser shopUser = shopUserService.getById(item.getDistributionUserId());
-        updateShopInfoAmount(orderInfo.getShopId(), item.getRewardAmount().negate(), orderInfo.getId(), TableValueConstant.DistributionAmountFlow.Type.SUB, "分销扣减");
-        updateIncome(item.getRewardAmount().negate(), item.getRewardAmount(), BigDecimal.ZERO,
-                item.getDistributionUserId(), shopUser.getUserId(), item.getShopUserId(), item.getShopId(), item.getLevel());
-        distributionFlowService.updateById(item);
-    }
-
    @Override
    public void distribute(Long sourceId, String orderNo, BigDecimal amount, Long sourceUserId, Long shopId, String type) {
        MkDistributionDeliver deliver = new MkDistributionDeliver().setSourceId(sourceId).setOrderNo(orderNo).setShopId(shopId).setType(type).setStatus("success");
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsUserServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsUserServiceImpl.java
@@ -192,7 +192,7 @@ public class MkPointsUserServiceImpl extends ServiceImpl<MkPointsUserMapper, MkP
                .shopId(pointsUser.getShopId())
                .shopUserId(pointsUser.getShopUserId())
                .floatType(PointsConstant.SUB.getValue())
-                .floatPoints(-floatPoints)
+                .floatPoints(floatPoints)
                .balancePoints(pointsUser.getPointBalance())
                .sourceId(orderId.toString())
                .content(reason)
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java
@@ -175,9 +175,9 @@ public class MkShopRechargeServiceImpl extends ServiceImpl<MkShopRechargeMapper,

        // 标准充值
        if (rechargeDetailId != null) {
+            FunUtils.asyncSafeRunVoid(() -> {
                MkShopRechargeDetail rechargeDetail = shopRechargeDetailService.getById(rechargeDetailId);
                shopUserMoneyEditDTO.setMoney(rechargeDetail.getAmount());
-            FunUtils.asyncSafeRunVoid(() -> {
                // 赠送金额
                ShopUserMoneyEditDTO shopUserMoneyEditRewardDTO = new ShopUserMoneyEditDTO()
                        .setId(shopUserId)
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/TbMemberConfigServiceImpl.java
@@ -361,7 +361,6 @@ public class TbMemberConfigServiceImpl extends ServiceImpl<TbMemberConfigMapper,
            memberExpFlowService.save(expFlow);

            upShopUser.setExperience(shopUser.getExperience() + exp);
-            shopUser.setExperience(upShopUser.getExperience());
            // 修改会员等级
            MemberLevelConfig nextConfig = levelConfigService.getOne(new QueryWrapper().eq(MemberLevelConfig::getShopId, shopUser.getMainShopId())
                    .gt(MemberLevelConfig::getExperienceValue, levelVO.getExperienceValue()).orderBy(MemberLevelConfig::getExperienceValue, true).limit(1));
--- a/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopOrderStatisticMapper.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/mapper/ShopOrderStatisticMapper.java
@@ -320,7 +320,7 @@ public interface ShopOrderStatisticMapper extends BaseMapper<ShopOrderStatistic>
            "   `order`.shop_id = #{shopId}   " +
            "   and trade_day = #{tradeDay}   " +
            "   and paid_time is not null" +
-            " group by detail.product_id, detail.sku_id")
+            " order by detail.product_id, detail.sku_id")
    List<ProductCostAmountVO> getOrderDetailProduct(Long shopId, LocalDate tradeDay);

 }
--- a/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/FeiPrinter.java
@@ -1,18 +1,17 @@
 package com.czg.service.order.print;

 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.text.UnicodeUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
 import com.czg.account.dto.HandoverRecordDTO;
+import com.czg.account.entity.HandoverRecord;
 import com.czg.account.entity.PrintMachine;
 import com.czg.account.entity.ShopInfo;
+import com.czg.account.service.ShopInfoService;
 import com.czg.order.entity.OrderDetail;
 import com.czg.order.entity.OrderInfo;
 import com.czg.service.order.enums.OrderStatusEnums;
+import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.http.HttpEntity;
@@ -21,21 +20,24 @@ import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;

 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;

 /**
 * @author Administrator
- * 接口文档  <a href="https://help.feieyun.com/home/doc/zh;nav=1-1">
 */
@Component
@Slf4j
 public class FeiPrinter extends PrinterHandler implements PrinterImpl {
+    @Resource
+    private RestTemplate restTemplate;
+
+    @Resource
+    private ShopInfoService shopInfoService;

    // API 地址
    private static final String URL = "http://api.feieyun.cn/Api/Open/";
@@ -70,8 +72,10 @@ public class FeiPrinter extends PrinterHandler implements PrinterImpl {
        String remark = orderDetail.getRemark();
        String content = buildDishPrintData(false, getPickupNum(orderInfo), orderInfo.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")),
                orderDetail.getProductName(), orderDetail.getSkuName(), orderDetail.getNum(), remark, orderDetail.getProGroupInfo(), orderDetail.getId(), orderDetail.isUrgent());
-        String o = sendPrintRequest(machine.getAddress(), content, null, "1");
-        printMachineLogService.save(orderInfo.getId(), machine, "新订单", content, o);
+        Object o = sendPrintRequest(machine.getAddress(), content, null, "1");
+        printMachineLogService.save(machine, "新订单", content, o);
+
+//        printMachineLogService.save(machine, "新订单", , );
    }


@@ -80,8 +84,8 @@ public class FeiPrinter extends PrinterHandler implements PrinterImpl {
        String remark = orderDetail.getRemark();
        String content = buildDishPrintData(true, getPickupNum(orderInfo), orderInfo.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")),
                orderDetail.getProductName(), orderDetail.getSkuName(), orderDetail.getReturnNum(), remark, orderDetail.getProGroupInfo(), orderDetail.getId(), orderDetail.isUrgent());
-        String o = sendPrintRequest(machine.getAddress(), content, null, "1");
-        printMachineLogService.save(orderInfo.getId(), machine, "退款单", content, o);
+        Object o = sendPrintRequest(machine.getAddress(), content, null, "1");
+        printMachineLogService.save(machine, "退款单", content, o);

    }

@@ -102,8 +106,8 @@ public class FeiPrinter extends PrinterHandler implements PrinterImpl {
                .setRemark(orderInfo.getRemark())
                .setDiscountAmount(orderInfo.getOriginAmount().subtract(orderInfo.getPayAmount()).toPlainString());
        String string = buildOrderPrintData(printInfoDTO, detailList);
-        String o = sendPrintRequest(machine.getAddress(), string, null, printerNum);
-        printMachineLogService.save(orderInfo.getId(), machine, "结算单", string, o);
+        Object o = sendPrintRequest(machine.getAddress(), string, null, printerNum);
+        printMachineLogService.save(machine, "退款单", string, o);

    }

@@ -139,15 +143,15 @@ public class FeiPrinter extends PrinterHandler implements PrinterImpl {
        }

        String string = buildOrderPrintData(printInfoDTO, detailList);
-        String resp = sendPrintRequest(machine.getAddress(), string, null, printerNum);
-        printMachineLogService.save(orderInfo.getId(), machine, "结算单", string, resp);
+        Object resp = sendPrintRequest(machine.getAddress(), string, null, printerNum);
+        printMachineLogService.save(machine, "结算单", string, resp);
    }

    @Override
    protected void callNumPrint(PrintMachine machine, String callNum, String shopName, String tableName, String tableNote, String preNum, String codeUrl, LocalDateTime takeTime, String shopNote) {
        String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一条新的排号记录\"}";
        String data = buildCallTicketData(shopName, tableName, callNum, preNum, codeUrl, shopNote, takeTime);
-        String resp = sendPrintRequest(machine.getAddress(), data, voiceJson, "1");
+        Object resp = sendPrintRequest(machine.getAddress(), data, voiceJson, "1");
        printMachineLogService.save(machine, "叫号单", data, resp);
    }

@@ -166,7 +170,7 @@ public class FeiPrinter extends PrinterHandler implements PrinterImpl {
    }

    @Override
-    public String sendPrintRequest(String address, String metaPrintData, String voiceData, String printerNum) {
+    public <R> R sendPrintRequest(String address, String metaPrintData, String voiceData, String printerNum) {
        log.info("飞蛾打印机开始发送打印请求, 设备地址: {}, 元数据: {}", address, metaPrintData);
        String time = String.valueOf(System.currentTimeMillis() / 1000);
        MultiValueMap<String, String> formData = new LinkedMultiValueMap<>();
@@ -185,68 +189,12 @@ public class FeiPrinter extends PrinterHandler implements PrinterImpl {
            HttpEntity<MultiValueMap<String, String>> requestEntity = new HttpEntity<>(formData, headers);

            String result = restTemplate.postForObject(URL, requestEntity, String.class);
-            log.info("飞鹅打印结果: {}", result);
-            return result;
+            log.info("打印结果: {}", result);
+            return (R) result;
        } catch (Exception e) {
            log.error("打印请求失败: {}", e.getMessage());
            throw new RuntimeException("飞蛾打印请求失败", e);
        }
    }

-    /**
-     * 检查飞鹅打印机 打印任务是否已打印
-     *
-     * @param printOrderId 打印订单编号
-     * @return null-未知错误，true-已打印，false-未打印
-     */
-    public Boolean checkFPrintStatus(String printOrderId) {
-        String time = String.valueOf(System.currentTimeMillis() / 1000);
-        Map<String, Object> paramMap = new HashMap<>();
-        paramMap.put("user", USER);
-        paramMap.put("stime", time);
-        paramMap.put("sig", signature(time));
-        paramMap.put("apiname", "Open_queryOrderState");
-        paramMap.put("orderid", printOrderId);
-        Boolean ret;
-        try {
-            String resp = HttpUtil.post(URL, paramMap, 1000 * 5);
-            //成功 {"msg":"ok","ret":0,"data":true,"serverExecutedTime":4}
-            //失败 {"msg":"ok","ret":0,"data":false,"serverExecutedTime":4}
-            JSONObject json = JSONUtil.parseObj(UnicodeUtil.toString(resp));
-            log.info("飞鹅打印机 打印任务状态响应: {}", json);
-            ret = json.getBool("data");
-        } catch (Exception e) {
-            ret = null;
-        }
-        return ret;
-    }
-
-    /**
-     * 检查飞鹅打印机是否在线
-     *
-     * @param sn 设备编号
-     * @return 在线，工作状态正常。/离线。/未知错误
-     */
-    public String checkOnline(String sn) {
-        String time = String.valueOf(System.currentTimeMillis() / 1000);
-        Map<String, Object> paramMap = new HashMap<>();
-        paramMap.put("user", USER);
-        paramMap.put("stime", time);
-        paramMap.put("sig", signature(time));
-        paramMap.put("apiname", "Open_queryPrinterStatus");
-        paramMap.put("sn", sn);
-        String msg;
-        try {
-            String resp = HttpUtil.post(URL, paramMap, 1000 * 5);
-            //成功 开机 {"msg":"ok","ret":0,"data":"在线，工作状态正常。","serverExecutedTime":4}
-            //成功 离线 {"msg":"ok","ret":0,"data":"离线。","serverExecutedTime":7}
-            JSONObject json = JSONUtil.parseObj(UnicodeUtil.toString(resp));
-            log.info("飞鹅打印机状态响应: {}", json);
-            msg = json.getStr("data");
-        } catch (Exception e) {
-            msg = "未知错误";
-        }
-        return msg;
-    }
-
 }
--- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterHandler.java
@@ -34,7 +34,6 @@ import lombok.ToString;
 import lombok.experimental.Accessors;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
-import org.springframework.web.client.RestTemplate;

 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -50,9 +49,10 @@ public abstract class PrinterHandler {
    @Setter
    protected PrinterHandler nextPrinter;
    protected String printerBrand;
+    // 创建 ThreadLocal 变量
+    private static final ThreadLocal<String> ERR_MSG = ThreadLocal.withInitial(() -> "");
+

-    @Resource
-    protected RestTemplate restTemplate;
    @Resource
    protected OrderDetailService orderDetailService;
    @Resource
@@ -84,11 +84,7 @@ public abstract class PrinterHandler {
    @Getter
    public enum PrintTypeEnum {
        HANDOVER("交班", "handover"),
-        ORDER("订单", "order"),
-        ONE("菜品", "one"),
-        CALL("叫号", "call"),
-        ONE_AND_ORDER("菜品和结算单同时打印", "oneAndOrder"),
-        PRE_ORDER("预结算单", "preOrder");
+        ORDER("订单", "order"), ONE("菜品", "one"), CALL("叫号", "call"), ONE_AND_ORDER("菜品和结算单同时打印", "oneAndOrder"), PRE_ORDER("预结算单", "preOrder");
        private final String name;
        private final String code;

@@ -177,6 +173,10 @@ public abstract class PrinterHandler {
            wrapper.like(PrintMachine::getPrintType, printType);
        }
        List<PrintMachine> list = printMachineService.list(wrapper);
+//        for (PrintMachine item : list) {
+//            //实际打印以传递的参数为准
+//            item.setPrintMethod(printMethod);
+//        }
        if (list.isEmpty()) {
            log.error("店铺未配置打印机，店铺id: {}", shopId);
            return list;
@@ -188,7 +188,6 @@ public abstract class PrinterHandler {

    /**
     * 处理打印
-     *
     * @param data 传递的数据
     * @param printTypeEnum order returnOrder preOrder one call handover
     */
@@ -342,7 +341,6 @@ public abstract class PrinterHandler {
            case PrintTypeEnum.ORDER:
                log.info("准备开始打印订单");
                if (data instanceof OrderInfo orderInfo) {
-                    redisService.set("order:print:" + orderInfo.getId(),"", 180);
                    List<OrderDetail> orderDetailList = orderDetailService.list(new QueryWrapper().eq(OrderDetail::getOrderId, orderInfo.getId()));
                    onlyFrontDesk(machine, false, orderInfo, orderDetailList);
                }else {
@@ -352,7 +350,6 @@ public abstract class PrinterHandler {
            case PrintTypeEnum.PRE_ORDER:
                log.info("准备开始打印预结算订单");
                if (data instanceof OrderInfo orderInfo) {
-                    redisService.set("order:print:" + orderInfo.getId(),"", 180);
                    List<OrderDetail> orderDetailList = orderDetailService.list(new QueryWrapper().eq(OrderDetail::getOrderId, orderInfo.getId()));
                    onlyFrontDesk(machine, true, orderInfo, orderDetailList);
                }else {
@@ -362,7 +359,6 @@ public abstract class PrinterHandler {
            case PrintTypeEnum.ONE:
                log.info("准备开始打印菜品单");
                if (data instanceof OrderInfo orderInfo) {
-                    redisService.set("order:print:" + orderInfo.getId(),"", 180);
                    List<OrderDetail> orderDetailList = orderDetailService.list(new QueryWrapper().eq(OrderDetail::getOrderId, orderInfo.getId()));
                    onlyKitchen(machine, orderInfo, orderDetailList);
                }else {
@@ -380,7 +376,6 @@ public abstract class PrinterHandler {
            case PrintTypeEnum.ONE_AND_ORDER:
                log.info("准备开始打印菜品以及结算单");
                if (data instanceof OrderInfo orderInfo) {
-                    redisService.set("order:print:" + orderInfo.getId(),"", 180);
                    List<OrderDetail> orderDetailList = orderDetailService.list(new QueryWrapper().eq(OrderDetail::getOrderId, orderInfo.getId()));
                    switch (machine.getPrintMethod()) {
                        case "all":
@@ -453,7 +448,17 @@ public abstract class PrinterHandler {
                log.info("台位费商品，不打印");
                return;
            }
+//            ProdSku sku = prodSkuService.getById(item.getSkuId());
+//            if (isTemporary == 0 && sku == null) {
+//                log.error("商品不存在, id: {}", item.getSkuId());
+//                return;
+//            } else if (isTemporary == 1) {
+//                sku = new ProdSku();
+//            }

+
+//            String remark = StrUtil.isNotBlank(sku.getSpecInfo()) ? sku.getSpecInfo() : "";
+//            item.setRemark(remark);
            if (item.getReturnNum().compareTo(BigDecimal.ZERO) > 0) {
                returnDishesPrint(orderInfo, item, machine);
            }
@@ -464,8 +469,7 @@ public abstract class PrinterHandler {

            // 保存已打印信息
            OrderDetail orderDetail = detailMap.get(item.getId());
-            redisService.set(RedisCst.getPrintOrderDetailKey(orderInfo.getId(), item.getId()),
-                    JSONObject.toJSONString(new PrintDetailInfo().setPrint(item.getIsPrint() == 1).setDetailId(item.getId())
+            redisService.set(RedisCst.getPrintOrderDetailKey(orderInfo.getId(), item.getId()), JSONObject.toJSONString(new PrintDetailInfo().setPrint(item.getIsPrint() == 1).setDetailId(item.getId())
                    .setPrintNum(orderDetail.getNum()).setPrintReturnNum(orderDetail.getReturnNum())), 3600 * 24);

        });
--- a/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/PrinterImpl.java
@@ -9,6 +9,7 @@ import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.czg.account.dto.HandoverRecordDTO;
+import com.czg.account.entity.HandoverRecord;
 import com.czg.order.entity.OrderDetail;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -68,9 +69,10 @@ public interface PrinterImpl {
     * @param metaPrintData 打印元数据
     * @param voiceData     语音信息
     * @param printNum      打印联数
+     * @param <R>           返回数据类型
     * @return 打印结果
     */
-    String sendPrintRequest(String address, String metaPrintData, String voiceData, String printNum);
+    <R> R sendPrintRequest(String address, String metaPrintData, String voiceData, String printNum);

    /**
     * 获取当前打印机标签信息
@@ -558,6 +560,12 @@ public interface PrinterImpl {
        return str;
    }

+    public static void main(String[] args) {
+        System.out.println("水煮肉片".length());
+        System.out.println(StrUtil.repeat(' ', 8));
+        System.out.println(StrUtil.fillAfter("水煮肉片", ' ', 21));
+    }
+
    /**
     * 获取填充字符串, 并且换行
     *
--- a/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/print/YxyPrinter.java
@@ -4,10 +4,11 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
-import cn.hutool.http.HttpUtil;
 import com.czg.account.dto.HandoverRecordDTO;
+import com.czg.account.entity.HandoverRecord;
 import com.czg.account.entity.PrintMachine;
 import com.czg.account.entity.ShopInfo;
+import com.czg.account.service.ShopInfoService;
 import com.czg.order.entity.OrderDetail;
 import com.czg.order.entity.OrderInfo;
 import com.czg.service.order.enums.OrderStatusEnums;
@@ -19,14 +20,16 @@ import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;

+import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.util.*;

 /**
- * 博实结-云享印打印机
- * 接口文档 <a href="https://bsj2.yuque.com/bsj/izhmfn/rr8b5g?#ZbE6s">
+ * 云享印打印机
+ *
 * @author Administrator
 */
@Slf4j
@@ -42,6 +45,12 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl {
    //APPSECRET
    private static final String APP_SECRET = "2022bsjZF544GAH";

+    @Resource
+    private ShopInfoService shopInfoService;
+
+    @Resource
+    private RestTemplate restTemplate;
+
    public YxyPrinter() {
        super("云想印");
    }
@@ -66,7 +75,7 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl {


    @Override
-    public String sendPrintRequest(String address, String metaPrintData, String voiceData, String printNum) {
+    public <R> R sendPrintRequest(String address, String metaPrintData, String voiceData, String printNum) {
        log.info("开始请求云享印，请求数据：{}, {}", voiceData, metaPrintData);
        //设备名称
        //行为方式 1:只打印数据 2:只播放信息 3:打印数据并播放信息
@@ -78,9 +87,10 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl {
        String time = String.valueOf(System.currentTimeMillis());
        String uuid = UUID.randomUUID().toString();

+        Map<String, String> param = getToken(time, uuid);
        //参数
        MultiValueMap<String, Object> multiValueMap = new LinkedMultiValueMap<>();
-        multiValueMap.add("token", getToken(time, uuid));
+        multiValueMap.add("token", param.get("TOKEN"));
        multiValueMap.add("devName", address);
        multiValueMap.add("actWay", 3);
        multiValueMap.add("cn", printNum);
@@ -98,7 +108,7 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl {
                httpEntity, String.class);

        log.info("请求云享印成功，响应数据: {}", httpResponse);
-        return httpResponse;
+        return (R) httpResponse;
    }

    @Override
@@ -106,8 +116,10 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl {
        String buildDishPrintData = buildDishPrintData(false, getPickupNum(orderInfo), DateUtil.format(orderDetail.getCreateTime(), "yyyy-MM-dd HH:mm:ss"), orderDetail.getProductName(), orderDetail.getSkuName(),
                orderDetail.getNum(), orderDetail.getRemark(), orderDetail.getProGroupInfo(), orderDetail.getId(), orderDetail.isUrgent());
        String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}";
-        String resp = sendPrintRequest(machine.getAddress(), buildDishPrintData, voiceJson, "1");
-        printMachineLogService.save(orderInfo.getId(), machine, "新订单", buildDishPrintData, resp);
+//        String voiceJson = "{\"bizType\":\"2\",\"content\":\"\"}";
+        Object resp = sendPrintRequest(machine.getAddress(), buildDishPrintData, voiceJson, "1");
+//        sendPrintRequest(voiceJson, 3, 1, machine.getAddress(), data);
+        printMachineLogService.save(machine, "新订单", buildDishPrintData, resp);

    }

@@ -115,9 +127,10 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl {
    protected void returnDishesPrint(OrderInfo orderInfo, OrderDetail orderDetail, PrintMachine machine) {
        String buildDishPrintData = buildDishPrintData(true, getPickupNum(orderInfo), DateUtil.format(orderDetail.getCreateTime(), "yyyy-MM-dd HH:mm:ss"), orderDetail.getProductName(), orderDetail.getSkuName(),
                orderDetail.getReturnNum(), orderDetail.getRemark(), orderDetail.getProGroupInfo(), orderDetail.getId(), orderDetail.isUrgent());
+//        String voiceJson = "{\"bizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}";
        String voiceJson = "{\"bizType\":\"2\",\"content\":\"\"}";
-        String resp = sendPrintRequest(machine.getAddress(), buildDishPrintData, voiceJson, "1");
-        printMachineLogService.save(orderInfo.getId(), machine, "退款单", buildDishPrintData, resp);
+        Object resp = sendPrintRequest(machine.getAddress(), buildDishPrintData, voiceJson, "1");
+        printMachineLogService.save(machine, "退款单", buildDishPrintData, resp);

    }

@@ -128,17 +141,18 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl {
                .setOrderNo(orderInfo.getOrderNo()).setTradeDate(DateUtil.format(orderInfo.getCreateTime(), "yyyy-MM-dd HH:mm:ss")).setOperator("【POS-1】001").setPayAmount(orderInfo.getPayAmount().toPlainString())
                .setOriginalAmount(orderInfo.getOriginAmount().toPlainString()).setReturn(isReturn(orderInfo))
                .setBalance(balance).setPayType((ObjectUtil.isEmpty(orderInfo.getPayType()) || ObjectUtil.isNull(orderInfo.getPayType()) ? "" : orderInfo.getPayType())).setIntegral("0")
-                .setOutNumber(orderInfo.getTakeCode()).setPrintTitle("退款单")
+                .setOutNumber(orderInfo.getTakeCode()).setPrintTitle("结算单")
                .setRemark(orderInfo.getRemark()).setDiscountAmount(orderInfo.getOriginAmount().subtract(orderInfo.getPayAmount()).toPlainString());

        String data = buildOrderPrintData(printInfoDTO, detailList);
        String voiceJson = "{\"PbizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}";
+//        String voiceJson = "{\"bizType\":\"2\",\"content\":\"\"}";
        String printerNum = "1";
        if (StrUtil.isNotBlank(machine.getPrintQty())) {
            printerNum = machine.getPrintQty().split("\\^")[1];
        }
        String resp = sendPrintRequest(machine.getAddress(), data, voiceJson, printerNum);
-        printMachineLogService.save(orderInfo.getId(), machine, "退款单", data, resp);
+        printMachineLogService.save(machine, "新订单", data, resp);

    }

@@ -169,28 +183,23 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl {

        String data = buildOrderPrintData(printInfoDTO, detailList);
        String voiceJson = "{\"PbizType\":\"2\",\"content\":\"您有一笔新的订单，请及时处理\"}";
+//        String voiceJson = "{\"bizType\":\"2\",\"content\":\"\"}";
        String printerNum = "1";
        if (StrUtil.isNotBlank(machine.getPrintQty())) {
            printerNum = machine.getPrintQty().split("\\^")[1];
        }
        String resp = sendPrintRequest(machine.getAddress(), data, voiceJson, printerNum);
-        printMachineLogService.save(orderInfo.getId(), machine, "结算单", data, resp);
+//        printMachineLogService.save(machine, printType, data, resp);
+        printMachineLogService.save(machine, "新订单", data, resp);

    }

-    /**
-     * 叫号单打印
-     */
    @Override
    protected void callNumPrint(PrintMachine machine, String callNum, String shopName, String tableName, String tableNote, String preNum, String codeUrl, LocalDateTime takeTime, String shopNote) {
        String resp = buildCallTicketData(shopName, tableName, callNum, preNum, codeUrl, shopNote, takeTime);
        sendPrintRequest(machine.getAddress(), resp, null, "1");
    }

-
-    /**
-     * 交班单打印
-     */
    @Override
    protected void handoverPrint(PrintMachine machine, HandoverRecordDTO record) {
        String string = buildHandoverData(record);
@@ -205,9 +214,9 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl {
     * @param requestId 请求ID，自定义
     * @return token信息
     */
-    private static String getToken(String timestamp, String requestId) {
+    private static Map<String, String> getToken(String timestamp, String requestId) {
        StringBuilder token = new StringBuilder();
-//        StringBuilder encode = new StringBuilder();
+        StringBuilder encode = new StringBuilder();
        SortedMap<String, Object> map = new TreeMap<>();
        map.put("appId", APP_ID);
        map.put("timestamp", timestamp);
@@ -217,38 +226,13 @@ public class YxyPrinter extends PrinterHandler implements PrinterImpl {
            String key = next.getKey();
            Object value = next.getValue();
            token.append(key).append(value);
-//            encode.append(key).append("=").append(value).append("&");
+            encode.append(key).append("=").append(value).append("&");
        }
-//        Map<String, String> finalMap = new HashMap<>();
-//        finalMap.put("ENCODE", encode.toString());
-//        finalMap.put("TOKEN", SecureUtil.md5(token + APP_SECRET).toUpperCase());
-//        return finalMap;
-        return SecureUtil.md5(token + APP_SECRET).toUpperCase();
+        Map<String, String> finalMap = new HashMap<>();
+        finalMap.put("ENCODE", encode.toString());
+        finalMap.put("TOKEN", SecureUtil.md5(token + APP_SECRET).toUpperCase());
+        return finalMap;
    }


-    /**
-     * 检查打印状态
-     *
-     * @param devName 设备名称，(唯一) 对应配置表中的address字段即（IP地址/打印机编号）
-     * @param taskId  打印任务id，用于复查打印状态，云想印=orderId
-     */
-    public String checkPrintStatus(String devName, String taskId) {
-        String time = String.valueOf(System.currentTimeMillis());
-        String uuid = UUID.randomUUID().toString();
-
-        Map<String, Object> paramMap = new HashMap<>();
-
-        paramMap.put("devName", devName);
-        paramMap.put("orderId", taskId);
-        paramMap.put("token", getToken(time, uuid));
-        paramMap.put("appId", APP_ID);
-        paramMap.put("timestamp", time);
-        paramMap.put("requestId", uuid);
-        paramMap.put("userCode", USER_CODE);
-        String s = HttpUtil.get("https://ioe.car900.com/v1/openApi/dev/findOrder.json", paramMap, 1000 * 5);
-        log.info("云想印打印机：{}，任务：{}状态：{}", devName, taskId, s);
-        return s;
-    }
-
 }
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DistributionPayServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/DistributionPayServiceImpl.java
@@ -35,7 +35,7 @@ public class DistributionPayServiceImpl implements DistributionPayService {
    private final BigDecimal MONEY_RATE = new BigDecimal("100");

    @Resource
-    private OrderPaymentService paymentService;
+    private OrderPaymentService orderPaymentService;
    @Resource
    private MkDistributionConfigService configService;
    @Resource
@@ -71,7 +71,7 @@ public class DistributionPayServiceImpl implements DistributionPayService {
                .setPayType(PayTypeConstants.PayType.PAY)
                .setOrderNo(payParam.getPlatformType() + IdUtil.getSnowflakeNextId())
                .setAmount(isRecharge ? payParam.getAmount() : detail.getPayAmount());
-        paymentService.save(orderPayment);
+        orderPaymentService.save(orderPayment);

        InitInfo initInfo = new InitInfo().setConfig(detail);
        if (isRecharge) {
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoCustomServiceImpl.java
@@ -1516,9 +1516,6 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {

    @Override
    public Boolean printOrder(Long shopId, OrderInfoPrintDTO orderInfoPrintDTO) {
-        if (redisService.hasKey("order:print:" + orderInfoPrintDTO.getId())) {
-            throw new CzgException("网络打印机正在尝试打印中。如需重打，请稍后再试！");
-        }
        OrderInfo orderInfo = orderInfoService.getOne(new QueryWrapper().eq(OrderInfo::getShopId, shopId).eq(OrderInfo::getId, orderInfoPrintDTO.getId()));
        if (orderInfo == null) {
            throw new CzgException("订单信息不存在");
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPaymentServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPaymentServiceImpl.java
@@ -22,10 +22,10 @@ public class OrderPaymentServiceImpl extends ServiceImpl<OrderPaymentMapper, Ord
    @Override
    public BigDecimal countMemberInAmount(Long shopId, Long shopUserId) {
        return getOneAs(QueryWrapper.create().select("IFNULL(sum(amount), 0) as total_amount")
-                .eq(OrderPayment::getShopId, shopId)
+                .eq(OrderPayment::getShopId, 143)
                .eq(OrderPayment::getSourceType, PayTypeConstants.SourceType.MEMBER_IN)
                .eq(OrderPayment::getPayType, PayTypeConstants.PayType.PAY)
-                .eq(OrderPayment::getSourceId, shopUserId)
+                .eq(OrderPayment::getSourceId, 127452)
                .eq(OrderPayment::getPayStatus, PayTypeConstants.PayStatus.SUCCESS), BigDecimal.class);
    }
 }
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PrintMachineLogServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PrintMachineLogServiceImpl.java
@@ -2,36 +2,32 @@ package com.czg.service.order.service.impl;

 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.date.LocalDateTimeUtil;
+import cn.hutool.core.map.MapProxy;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.text.UnicodeUtil;
 import cn.hutool.core.thread.ThreadUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson2.JSONObject;
+import cn.hutool.crypto.SecureUtil;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import com.czg.account.entity.PrintMachine;
-import com.czg.config.RedisCst;
-import com.czg.market.service.OrderInfoService;
-import com.czg.order.entity.OrderInfo;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.mybatisflex.core.query.QueryWrapper;
+import com.mybatisflex.spring.service.impl.ServiceImpl;
 import com.czg.order.entity.PrintMachineLog;
 import com.czg.order.service.PrintMachineLogService;
-import com.czg.service.RedisService;
 import com.czg.service.order.mapper.PrintMachineLogMapper;
-import com.czg.service.order.print.FeiPrinter;
-import com.czg.service.order.print.YxyPrinter;
-import com.mybatisflex.spring.service.impl.ServiceImpl;
-import jakarta.annotation.Resource;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.context.annotation.Lazy;
+import org.apache.commons.codec.digest.DigestUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;

-import java.time.LocalDateTime;
-import java.util.Map;
-import java.util.concurrent.Executors;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicReference;
+import java.util.*;

 /**
 * 店铺小票打印记录ServiceImpl
@@ -43,46 +39,138 @@ import java.util.concurrent.atomic.AtomicReference;
@Service
@RequiredArgsConstructor
 public class PrintMachineLogServiceImpl extends ServiceImpl<PrintMachineLogMapper, PrintMachineLog> implements PrintMachineLogService{
+    //请求地址
+    private static final String URL_STR = "https://ioe.car900.com/v1/openApi/dev/customPrint.json";
+    //APPID
+    private static final String APP_ID = "ZF544";
+    //USERCODE
+    private static final String USER_CODE = "ZF544";
+    //APPSECRET
+    private static final String APP_SECRET = "2022bsjZF544GAH";

-    @Resource
-    private OrderInfoService orderInfoService;
-    @Lazy
-    @Resource
-    private YxyPrinter yxyPrinter;
-    @Lazy
-    @Resource
-    private FeiPrinter feiPrinter;
-    @Resource
-    private RedisService redisService;
+    public static final String URL = "http://api.feieyun.cn/Api/Open/";//不需要修改

-    Map<Integer, String> yxxStatusMap = Map.of(
-            0, "离线(设备上线后自动补打)",
-            1, "在线",
-            2, "获取失败",
-            3, "未激活",
-            4, "设备已禁用");
-
-    @Async
-    @Override
-    public void save(PrintMachine config, String bizType, String printContent, String respJson) {
-        if (config == null) {
-            return;
+    public static final String USER = "chaozhanggui2022@163.com";//*必填*：账号名
+    public static final String UKEY = "UfWkhXxSkeSSscsU";//*必填*: 飞鹅云后台注册账号后生成的UKEY 【备注：这不是填打印机的KEY】
+    public static final String SN = "960238952";//*必填*：打印机编号，必须要在管理后台里添加打印机或调用API接口添加之后，才能调用API
+    /**
+     * 获取TOKEN值
+     *
+     * @param timestamp 时间戳，13位
+     * @param requestId 请求ID，自定义
+     * @return
+     */
+    private static Map<String, String> getToken(String timestamp, String requestId) {
+        StringBuilder token = new StringBuilder();
+        StringBuilder encode = new StringBuilder();
+        SortedMap<String, Object> map = new TreeMap<>();
+        map.put("appId", APP_ID);
+        map.put("timestamp", timestamp);
+        map.put("requestId", requestId);
+        map.put("userCode", USER_CODE);
+        for (Map.Entry<String, Object> next : map.entrySet()) {
+            String key = next.getKey();
+            Object value = next.getValue();
+            token.append(key).append(value);
+            encode.append(key).append("=").append(value).append("&");
        }
-        save(null, config, bizType, printContent, respJson);
+        System.out.println("token" + token);
+        Map<String, String> finalMap = new HashMap<>();
+        finalMap.put("ENCODE", encode.toString());
+        System.out.println("+++++++++++++++" + token + APP_SECRET);
+        finalMap.put("TOKEN", SecureUtil.md5(token + APP_SECRET).toUpperCase());
+        return finalMap;
    }
+    /**
+     * 检查打印状态
+     *
+     * @param devName 设备名称，(唯一) 对应配置表中的address字段即（IP地址/打印机编号）
+     * @param taskId  打印任务id，用于复查打印状态，云想印=orderId
+     * @return
+     */
+    public static String checkPrintStatus(String devName, String taskId) {
+        String time = String.valueOf(System.currentTimeMillis());
+        String uuid = UUID.randomUUID().toString();

+        Map<String, String> param = getToken(time, uuid);
+        String token = param.get("TOKEN");
+        Map<String, Object> paramMap = new HashMap<>();
+
+        paramMap.put("devName", devName);
+        paramMap.put("orderId", taskId);
+        paramMap.put("token", token);
+        paramMap.put("appId", APP_ID);
+        paramMap.put("timestamp", time);
+        paramMap.put("requestId", uuid);
+        paramMap.put("userCode", USER_CODE);
+
+        return HttpUtil.get("https://ioe.car900.com/v1/openApi/dev/findOrder.json", paramMap, 1000 * 5);
+    }
+    private static String signature(String USER, String UKEY, String STIME) {
+        return DigestUtils.sha1Hex(USER + UKEY + STIME);
+    }
+    /**
+     * 检查飞鹅打印机打印任务是否已打印
+     *
+     * @param printOrderId 打印订单编号
+     * @return null-未知错误，true-已打印，false-未打印
+     */
+    public static Boolean checkFPrintStatus(String printOrderId) {
+        String STIME = String.valueOf(System.currentTimeMillis() / 1000);
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("user", USER);
+        paramMap.put("stime", STIME);
+        paramMap.put("sig", signature(USER, UKEY, STIME));
+        paramMap.put("apiname", "Open_queryOrderState");
+        paramMap.put("orderid", printOrderId);
+        Boolean ret;
+        try {
+            String resp = HttpUtil.post(URL, paramMap, 1000 * 5);
+            //成功 {"msg":"ok","ret":0,"data":true,"serverExecutedTime":4}
+            //失败 {"msg":"ok","ret":0,"data":false,"serverExecutedTime":4}
+            JSONObject json = JSONUtil.parseObj(UnicodeUtil.toString(resp));
+            ret = json.getBool("data");
+        } catch (Exception e) {
+            ret = null;
+        }
+        return ret;
+    }
+    /**
+     * 检查飞鹅打印机是否在线
+     *
+     * @param sn 设备编号
+     * @return 在线，工作状态正常。/离线。/未知错误
+     */
+    public static String checkOnline(String sn) {
+        String STIME = String.valueOf(System.currentTimeMillis() / 1000);
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("user", USER);
+        paramMap.put("stime", STIME);
+        paramMap.put("sig", signature(USER, UKEY, STIME));
+        paramMap.put("apiname", "Open_queryPrinterStatus");
+        paramMap.put("sn", sn);
+        String msg;
+        try {
+            String resp = HttpUtil.post(URL, paramMap, 1000 * 5);
+            //成功 开机 {"msg":"ok","ret":0,"data":"在线，工作状态正常。","serverExecutedTime":4}
+            //成功 离线 {"msg":"ok","ret":0,"data":"离线。","serverExecutedTime":7}
+            JSONObject json = JSONUtil.parseObj(UnicodeUtil.toString(resp));
+            msg = json.getStr("data");
+        } catch (Exception e) {
+            msg = "未知错误";
+        }
+        return msg;
+    }
    /**
     * 保存打印记录
     *
-     * @param orderId      订单Id
     * @param config       打印机配置
     * @param bizType      业务类型
     * @param printContent 打印内容
     * @param respJson     打印机响应结果
     */
    @Async
-    @Override
-    public void save(Long orderId, PrintMachine config, String bizType, String printContent, String respJson) {
+    public void save(PrintMachine config, String bizType, String printContent, Object respJson) {
        if (config == null) {
            return;
        }
@@ -91,41 +179,51 @@ public class PrintMachineLogServiceImpl extends ServiceImpl<PrintMachineLogMappe
        int failFlag = 0;
        String respCode = "0";
        String respMsg = "打印中";
-        JSONObject resp = JSONObject.parseObject(respJson);
+
+        Map<Integer, String> yxxStatusMap = MapUtil.builder(0, "离线(设备上线后自动补打)").put(1, "在线").put(2, "获取失败").put(3, "未激活").put(4, "设备已禁用").build();
        // 云想印
-        if ("云想印".equals(config.getContentType())) {
-            int code = resp.getIntValue("code");
-            JSONObject respData = resp.getJSONObject("data");
-            JSONObject data = respData.getJSONObject("data");
+        if ("云享印".equals(config.getContentType())) {
+            cn.hutool.json.JSONObject resp = JSONUtil.parseObj(respJson);
+            int code = resp.getInt("code");
+            cn.hutool.json.JSONObject data = resp.getJSONObject("data").getJSONObject("data");
            //设备状态，0: 离线, 1: 在线, 2: 获取失败, 3:未激活, 4:设备已禁用
-            int status = data.getIntValue("status");
+            int status = data.getInt("status");
            if (code != 0) {
                failFlag = 1;
                respCode = code + "";
-                respMsg = resp.getString("msg");
+                respMsg = resp.getStr("msg");
            } else if (status != 1) {
                failFlag = 1;
                respCode = code + "";
+
                respMsg = status + "_" + yxxStatusMap.get(status);
            }
            if (code == 0) {
-                entity.setTaskId(respData.getString("orderId"));
+                String taskId = resp.getJSONObject("data").getStr("orderId");
+                entity.setTaskId(taskId);
            }
            // 飞鹅云打印机暂时没有适配，先return不做打印记录
        } else if ("飞鹅".equals(config.getContentType())) {
-            int ret = resp.getIntValue("ret");
+            cn.hutool.json.JSONObject resp = JSONUtil.parseObj(respJson);
+            int ret = resp.getInt("ret");
            if (ret != 0) {
                failFlag = 1;
                respCode = ret + "";
-                respMsg = resp.getString("msg");
+                respMsg = resp.getStr("msg");
            } else {
-                entity.setTaskId(resp.getString("data"));
+                String printOrderId = resp.getStr("data");
+                entity.setTaskId(printOrderId);
            }
        } else {
            // 其他打印机暂时没有适配，先return不做打印记录
            return;
        }
        entity.setBizType(bizType);
+//        entity.setCreateUserId(config.getCurrentUserId());
+//        entity.setCreateUserName(config.getCurrentUserName());
+//        if (StrUtil.isNotBlank(config.getCurrentUserNickName())) {
+//            entity.setCreateUserName(StrUtil.concat(true, config.getCurrentUserNickName(), " | ", config.getCurrentUserName()));
+//        }
        entity.setPrintContent(printContent);
        entity.setCreateTime(DateUtil.date().toLocalDateTime());
        if (failFlag == 0) {
@@ -135,213 +233,66 @@ public class PrintMachineLogServiceImpl extends ServiceImpl<PrintMachineLogMappe
        entity.setRespCode(respCode);
        entity.setRespMsg(respMsg);
        super.save(entity);
-        ThreadUtil.execAsync(() -> checkPrintStatus(orderId, config, entity));
-    }

-    /**
-     * 类级别成员变量：基于虚拟线程的固定大小（5）定时线程池
-     * // Java 21+ 虚拟线程工厂，支持命名
-     */
-    private final ScheduledExecutorService virtualThreadScheduler = Executors.newScheduledThreadPool(
-            5,
-            Thread.ofVirtual().name("print-query-vt-", 0).factory()
-    );
-
-    /**
-     * 打印机状态查询（解决 retryFuture 爆红问题 + 虚拟线程 + 轮询重试）
-     *
-     * @param orderId 订单Id
-     * @param config  打印机配置
-     * @param entity  打印日志实体
-     */
-    public void checkPrintStatus(Long orderId, PrintMachine config, PrintMachineLog entity) {
-        // 最大重试次数
-        int maxRetryTimes = 5;
-        AtomicInteger executedTimes = new AtomicInteger(0);
-
-        // 原子引用包装ScheduledFuture，用于后续取消轮询
-        AtomicReference<ScheduledFuture<?>> retryFutureRef = new AtomicReference<>();
-
-        // 核心查询任务（修正后，逻辑内聚）
-        Runnable printQueryTask = () -> {
-            int currentTimes = executedTimes.incrementAndGet();
-            boolean isPrintSuccess = false;
-            boolean isLastTask = false;
-
-            try {
-                // 1. 云想印打印机状态查询
-                if ("云想印".equals(config.getContentType())) {
-                    String jsonStr = yxyPrinter.checkPrintStatus(config.getAddress(), entity.getTaskId());
-                    log.info("云想印打印状态查询结果（第{}次，虚拟线程：{}）：{}",
-                            currentTimes, Thread.currentThread().getName(), jsonStr);
-                    JSONObject resp = JSONObject.parseObject(jsonStr);
-                    int code = resp.getIntValue("code");
+        // 云想印
+        if ("云享印".equals(config.getContentType())) {
+            // 延迟3ms，复查打印状态 (用户可以根据设备信息查询到当前设备的在线情况（注：该接口只能提供参考，设备的离线状态是在设备离线3分钟后才会生效）)
+            ThreadUtil.safeSleep(1000 * 5);
+            String jsonStr = checkPrintStatus(config.getAddress(), entity.getTaskId());
+            cn.hutool.json.JSONObject resp = JSONUtil.parseObj(jsonStr);
+            int code = resp.getInt("code");
            if (code == 0) {
-                        JSONObject data = resp.getJSONObject("data");
-                        if (data.containsKey("status")) {
-                            isPrintSuccess = data.getBooleanValue("status", false);
-                            updatePrintLogEntity(entity, isPrintSuccess);
+                cn.hutool.json.JSONObject data = resp.getJSONObject("data");
+                boolean status = data.containsKey("status");
+                if (!status) {
+                    return;
                }
+                boolean success = data.getBool("status", false);
+                if (entity.getFailFlag() == 0 && success) {
+                    entity.setFailFlag(0);
+                    entity.setRespMsg("打印成功");
+                    entity.setPrintTime(entity.getCreateTime());
+                } else if (entity.getFailFlag() == 1 && success) {
+                    entity.setFailFlag(0);
+                    entity.setPrintTime(DateUtil.date().toLocalDateTime());
+                    entity.setRespMsg("打印成功");
+                    // 如果设备在线 and 休眠5秒后查询结果是未打印，即视为设备已离线，云端3分钟后才会同步到离线信息
+                } else if (entity.getFailFlag() == 0 && !success) {
+                    entity.setFailFlag(1);
+                    entity.setPrintTime(null);
+                    entity.setRespMsg("0_离线(设备上线后自动补打)");
+                } else {
+                    entity.setFailFlag(1);
+                    entity.setPrintTime(null);
+                    entity.setRespMsg(StrUtil.concat(true, "打印失败，", "_", entity.getRespMsg()));
                }
+                super.updateById(entity);
            }
-                // 2. 飞鹅云打印机状态查询
-                else if ("飞鹅".equals(config.getContentType())) {
-                    Boolean success = feiPrinter.checkFPrintStatus(entity.getTaskId());
+            // 飞鹅云打印机
+        } else if ("飞鹅".equals(config.getContentType())) {
+            ThreadUtil.safeSleep(1000 * 5);
+            Boolean success = checkFPrintStatus(entity.getTaskId());
            if (success == null) {
                entity.setFailFlag(1);
                entity.setRespMsg("打印失败，未知错误");
-                        entity.setPrintTime(null);
            } else if (success) {
-                        isPrintSuccess = true;
-                        updatePrintLogEntity(entity, true);
+                entity.setFailFlag(0);
+                entity.setPrintTime(DateUtil.date().toLocalDateTime());
+                entity.setRespMsg("打印成功");
            } else {
-                        String msg = feiPrinter.checkOnline(entity.getAddress());
+                String msg = checkOnline(entity.getAddress());
                if (msg.indexOf("在线，工作状态正常") > 0) {
-                            isPrintSuccess = true;
-                            updatePrintLogEntity(entity, true);
+                    entity.setFailFlag(0);
+                    entity.setPrintTime(DateUtil.date().toLocalDateTime());
+                    entity.setRespMsg("打印成功");
                } else {
-                            isPrintSuccess = false;
                    entity.setFailFlag(1);
                    entity.setPrintTime(null);
                    entity.setRespMsg(StrUtil.concat(true, "打印失败，", "_", msg));
                }
            }
-                } else {
-                    log.info("打印类型为其他类型，终止打印状态查询轮询任务");
-                    ScheduledFuture<?> future = retryFutureRef.get();
-                    if (future != null && !future.isCancelled()) {
-                        boolean cancelSuccess = future.cancel(false); // 取消后续轮询（不中断当前任务）
-                        log.info("其他打印类型，取消轮询任务：{}", cancelSuccess ? "成功" : "失败");
-                    }
-                }
-
-                // 3. 打印成功：取消后续轮询任务
-                if (isPrintSuccess) {
-                    isLastTask = true;
-                    ScheduledFuture<?> future = retryFutureRef.get();
-                    if (future != null && !future.isCancelled()) {
-                        future.cancel(false); // 不中断当前任务，仅取消后续任务
-                    }
-                    return;
-                }
-
-                // 4. 达到最大重试次数：取消后续轮询任务
-                if (currentTimes >= maxRetryTimes) {
-                    isLastTask = true;
-                    ScheduledFuture<?> future = retryFutureRef.get();
-                    if (future != null && !future.isCancelled()) {
-                        future.cancel(false);
-                    }
-                }
-
-            } catch (Exception e) {
-                log.error("第{}次打印机状态查询异常（虚拟线程：{}）",
-                        currentTimes, Thread.currentThread().getName(), e);
-                // 异常时达到最大重试次数，同样取消任务
-                if (currentTimes >= maxRetryTimes) {
-                    ScheduledFuture<?> future = retryFutureRef.get();
-                    if (future != null && !future.isCancelled()) {
-                        boolean cancelSuccess = future.cancel(false);
-                        log.info("查询异常且达到最大重试次数，取消轮询任务：{}", cancelSuccess ? "成功" : "失败");
-                    }
-                }
-            } finally {
-                //仅当是最后一次任务时，才执行更新操作
-                if (isLastTask) {
            super.updateById(entity);
-                    updateOrderEntity(orderId, config, isPrintSuccess);
-                }
-            }
-        };
-
-        // 修正：统一使用scheduleAtFixedRate，避免任务重复执行
-        // 首次延迟10秒执行，后续每隔30秒执行一次（符合原逻辑的首次查询延迟，后续轮询间隔）
-        ScheduledFuture<?> retryFuture = virtualThreadScheduler.scheduleAtFixedRate(
-                printQueryTask,
-                10,
-                30,
-                TimeUnit.SECONDS
-        );
-
-        // 修正：先赋值AtomicReference，再让任务可能执行，避免线程安全隐患
-        retryFutureRef.set(retryFuture);
-        // 修正：关闭钩子仅注册一次（通过静态代码块或类初始化时注册，避免重复注册）
-        registerShutdownHookOnce();
-    }
-
-    /**
-     * 更新状态
-     */
-    private void updateOrderEntity(Long orderId, PrintMachine config, boolean isPrintSuccess) {
-        redisService.runFunAndCheckKey(() -> {
-            OrderInfo orderInfo = orderInfoService.getOne(query().select(OrderInfo::getPrintStatus).eq(OrderInfo::getId, orderId));
-            if (orderInfo == null) {
-                orderInfo = new OrderInfo();
-            }
-            JSONObject jsonObject = new JSONObject();
-            jsonObject.put("id", config.getId());
-            jsonObject.put("name", config.getName());
-            jsonObject.put("time", LocalDateTimeUtil.formatNormal(LocalDateTime.now()));
-            orderInfo.upPrintStatus(jsonObject, isPrintSuccess);
-            orderInfoService.update(orderInfo, query().eq(OrderInfo::getId, orderId));
-            return orderInfo;
-        }, RedisCst.getLockKey("UP_ORDER_PRINT", orderId));
-        redisService.del("order:print:" + orderId);
-    }
-
-    /**
-     * 统一更新打印日志实体
-     *
-     * @param entity         打印日志实体
-     * @param isPrintSuccess 是否打印成功
-     */
-    private void updatePrintLogEntity(PrintMachineLog entity, boolean isPrintSuccess) {
-        if (isPrintSuccess) {
-            entity.setFailFlag(0);
-            entity.setRespMsg("打印成功");
-            entity.setPrintTime(entity.getFailFlag() == 0 ? entity.getCreateTime() : DateUtil.date().toLocalDateTime());
-        } else {
-            entity.setFailFlag(1);
-            entity.setPrintTime(null);
-            if (entity.getFailFlag() == 0) {
-                entity.setRespMsg("0_离线(设备上线后自动补打)");
-            } else {
-                entity.setRespMsg(entity.getRespMsg());
-            }
        }
    }

-    // 静态标识，确保关闭钩子仅注册一次
-    private static volatile boolean shutdownHookRegistered = false;
-    // 锁对象，保证线程安全
-    private static final Object HOOK_LOCK = new Object();
-
-    /**
-     * 统一注册JVM关闭钩子（仅执行一次）
-     */
-    private void registerShutdownHookOnce() {
-        if (!shutdownHookRegistered) {
-            synchronized (HOOK_LOCK) {
-                // 双重校验锁，避免多线程下重复注册
-                if (!shutdownHookRegistered) {
-                    Runtime.getRuntime().addShutdownHook(new Thread(() -> {
-                        if (virtualThreadScheduler != null && !virtualThreadScheduler.isShutdown()) {
-                            virtualThreadScheduler.shutdown();
-                            try {
-                                if (!virtualThreadScheduler.awaitTermination(10, TimeUnit.SECONDS)) {
-                                    log.warn("虚拟线程调度器10秒内未关闭，强制关闭...");
-                                    virtualThreadScheduler.shutdownNow();
-                                }
-                            } catch (InterruptedException e) {
-                                log.error("等待虚拟线程调度器终止时被中断，强制关闭", e);
-                                virtualThreadScheduler.shutdownNow();
-                                Thread.currentThread().interrupt(); // 保留中断状态
-                            }
-                        }
-                    }, "PrinterScheduler-ShutdownHook"));
-                    shutdownHookRegistered = true;
-                }
-            }
-        }
-    }
 }
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopOrderStatisticServiceImpl.java
@@ -226,7 +226,7 @@ public class ShopOrderStatisticServiceImpl extends ServiceImpl<ShopOrderStatisti
     */
    private BigDecimal getProductCostAmount(Long shopId, LocalDate day) {
        BigDecimal productCostAmount = BigDecimal.ZERO;
-        //获取orderDetail信息  productId skuId 数量
+        ////获取orderDetail信息  productId skuId 数量
        List<ProductCostAmountVO> orderDetailProduct = mapper.getOrderDetailProduct(shopId, day);
        orderDetailProduct = orderDetailProduct.stream()
                .filter(Objects::nonNull)
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopProdStatisticServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopProdStatisticServiceImpl.java
@@ -14,7 +14,10 @@ import org.springframework.stereotype.Service;

 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -164,99 +167,44 @@ public class ShopProdStatisticServiceImpl extends ServiceImpl<ShopProdStatisticM
     * @return 合并后的数据
     */
    private List<ShopProdStatistic> mergeProdStatistic(List<ShopProdStatistic> realTimeDataByDay, List<ShopProdStatistic> dateRange) {
-        // 1. 使用防御性编程，确保非空列表
-        List<ShopProdStatistic> realTimeData = Optional.ofNullable(realTimeDataByDay).orElseGet(ArrayList::new);
-        List<ShopProdStatistic> rangeData = Optional.ofNullable(dateRange).orElseGet(ArrayList::new);
+        if (realTimeDataByDay == null) {
+            realTimeDataByDay = new ArrayList<>();
+        }
+        if (dateRange == null) {
+            dateRange = new ArrayList<>();
+        }

-        calculateValidData(realTimeData);
-        calculateValidData(rangeData);
-
-        return Stream.concat(realTimeData.stream(), rangeData.stream())
+        return Stream.concat(realTimeDataByDay.stream(), dateRange.stream())
                .filter(Objects::nonNull)
                .collect(Collectors.toMap(
                        ShopProdStatistic::getProdId,
                        Function.identity(),
-                        this::mergeStatistics
-                ))
-                .values()
-                .stream()
-                .peek(this::recalculateValidData)
-                .toList();
-    }
-
-    /**
-     * 计算有效销售数据
-     */
-    private void calculateValidData(List<ShopProdStatistic> statistics) {
-        if (statistics == null || statistics.isEmpty()) {
-            return;
-        }
-
-        statistics.forEach(stat -> {
-            if (stat != null) {
-                stat.setValidSaleCount(safeSubtract(stat.getSaleCount(), stat.getRefundCount()));
-                stat.setValidSaleAmount(safeSubtract(stat.getValidSaleAmount(), stat.getRefundAmount()));
-            }
-        });
-    }
-
-    /**
-     * 合并两个统计对象
-     */
-    private ShopProdStatistic mergeStatistics(ShopProdStatistic stat1, ShopProdStatistic stat2) {
-        // 使用第一个非空对象作为基准
-        ShopProdStatistic baseStat = Optional.ofNullable(stat1).orElse(stat2);
-        ShopProdStatistic otherStat = stat1 == null ? null : stat2;
-
-        if (otherStat == null) {
-            return baseStat;
-        }
-
+                        (stat1, stat2) -> {
+                            // 创建合并后的对象
                            ShopProdStatistic merged = new ShopProdStatistic();
+                            merged.setId(stat1.getId());
+                            merged.setShopId(stat1.getShopId());
+                            merged.setProdId(stat1.getProdId());
+                            merged.setProductName(stat1.getProductName());

-        // 设置基本信息（优先使用非空值）
-        merged.setId(baseStat.getId());
-        merged.setShopId(baseStat.getShopId());
-        merged.setProdId(baseStat.getProdId());
-        merged.setProductName(
-                Optional.ofNullable(baseStat.getProductName())
-                        .orElse(otherStat.getProductName())
-        );
-
-        // 合并数值字段
-        merged.setSaleCount(safeAdd(baseStat.getSaleCount(), otherStat.getSaleCount()));
-        merged.setSaleAmount(safeAdd(baseStat.getSaleAmount(), otherStat.getSaleAmount()));
-        merged.setRefundCount(safeAdd(baseStat.getRefundCount(), otherStat.getRefundCount()));
-        merged.setRefundAmount(safeAdd(baseStat.getRefundAmount(), otherStat.getRefundAmount()));
+                            // 安全处理BigDecimal相加，处理null值
+                            merged.setSaleCount(safeAdd(stat1.getSaleCount(), stat2.getSaleCount()));
+                            merged.setSaleAmount(safeAdd(stat1.getSaleAmount(), stat2.getSaleAmount()));
+                            merged.setRefundCount(safeAdd(stat1.getRefundCount(), stat2.getRefundCount()));
+                            merged.setRefundAmount(safeAdd(stat1.getRefundAmount(), stat2.getRefundAmount()));

                            return merged;
                        }
-
-    /**
-     * 重新计算合并后的有效数据
-     */
-    private void recalculateValidData(ShopProdStatistic stat) {
-        if (stat != null) {
-            stat.setValidSaleCount(safeSubtract(stat.getSaleCount(), stat.getRefundCount()));
-            stat.setValidSaleAmount(safeSubtract(stat.getSaleAmount(), stat.getRefundAmount()));
-        }
+                ))
+                .values()
+                .stream()
+                .toList();
    }

-    /**
-     * 安全的BigDecimal加法（处理null值）
-     */
+
    private BigDecimal safeAdd(BigDecimal num1, BigDecimal num2) {
-        BigDecimal safeNum1 = Optional.ofNullable(num1).orElse(BigDecimal.ZERO);
-        BigDecimal safeNum2 = Optional.ofNullable(num2).orElse(BigDecimal.ZERO);
+        BigDecimal safeNum1 = num1 != null ? num1 : BigDecimal.ZERO;
+        BigDecimal safeNum2 = num2 != null ? num2 : BigDecimal.ZERO;
        return safeNum1.add(safeNum2);
    }
-
-    /**
-     * 安全的BigDecimal减法（处理null值）
-     */
-    private BigDecimal safeSubtract(BigDecimal num1, BigDecimal num2) {
-        BigDecimal safeNum1 = Optional.ofNullable(num1).orElse(BigDecimal.ZERO);
-        BigDecimal safeNum2 = Optional.ofNullable(num2).orElse(BigDecimal.ZERO);
-        return safeNum1.subtract(safeNum2);
-    }
 }
--- a/cash-service/order-service/src/main/java/com/czg/service/order/utils/FunUtil.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/utils/FunUtil.java
@@ -0,0 +1,125 @@
+package com.czg.service.order.utils;
+
+import cn.hutool.core.lang.func.Func0;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.script.DefaultRedisScript;
+import org.springframework.stereotype.Component;
+
+import java.util.Collections;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.function.Supplier;
+
+/**
+ * @author Administrator
+ */
+@Slf4j
+@Component
+public class FunUtil {
+    @Resource
+    private  RedisTemplate<String, Object> redisTemplate;
+    public static int retryCount = 5;
+
+    /**
+     * 执行任务并保证锁唯一
+     * @param supplier 业务逻辑
+     * @param lockKey Redis锁的Key
+     * @return 业务逻辑返回值
+     */
+    public <T> T runFunAndCheckKey(Supplier<T> supplier, String lockKey) {
+        String lockValue = String.valueOf(System.nanoTime() + Thread.currentThread().threadId());
+        try {
+            // 尝试获取锁，超时时间 5 秒，防止死锁
+            boolean lock = Boolean.TRUE.equals(redisTemplate.opsForValue().setIfAbsent(lockKey, lockValue, 5, TimeUnit.SECONDS));
+            int count = 0;
+            // 初始等待 10ms
+            int retryDelay = 10;
+
+            while (!lock) {
+                // 最多重试 10 次，大约 10 秒
+                if (count++ > 50) {
+                    throw new RuntimeException("系统繁忙, 稍后再试");
+                }
+                Thread.sleep(retryDelay);
+                // 指数退避，最大等待 200ms
+                retryDelay = Math.min(retryDelay * 2, 200);
+                lock = Boolean.TRUE.equals(redisTemplate.opsForValue().setIfAbsent(lockKey, lockValue, 5, TimeUnit.SECONDS));
+            }
+
+            // 执行任务
+            return supplier.get();
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            throw new RuntimeException("线程被中断", e);
+        } catch (Exception e) {
+            log.error("执行出错：{}", e.getMessage(), e);
+            throw e;
+        } finally {
+            // 释放锁（使用 Lua 脚本确保原子性）
+            unlock(lockKey, lockValue);
+        }
+    }
+
+    /**
+     * 使用 Lua 脚本确保释放锁的原子性
+     * @param lockKey 锁的 Key
+     * @param lockValue 当前线程的锁值
+     */
+    private void unlock(String lockKey, String lockValue) {
+        String luaScript =
+                "if redis.call('get', KEYS[1]) == ARGV[1] then " +
+                        "return redis.call('del', KEYS[1]) " +
+                        "else return 0 end";
+        redisTemplate.execute(new DefaultRedisScript<>(luaScript, Long.class),
+                Collections.singletonList(lockKey), lockValue);
+    }
+
+    public static <T, R> R runFunAndRetry(
+            Supplier<R> function,
+            Function<R, Boolean> check, Consumer<R> errFun) {
+        log.info("工具类开始执行函数");
+        R result = function.get();
+        boolean flag = check.apply(result);
+
+        log.info("执行结果: {}", result);
+
+        while (flag && retryCount-- > 0) {
+            log.info("执行函数失败, 剩余尝试次数{}", retryCount);
+            result = function.get();
+            log.info("执行结果: {}", result);
+            flag = check.apply(result);
+        }
+
+        if (flag) {
+            errFun.accept(result);
+        }
+        return result;
+    }
+
+    /**
+     * 防抖函数：在指定秒数内相同 Key 的任务只会执行一次
+     * @param key 防抖使用的 Redis Key
+     * @param seconds 防抖时间（秒）
+     * @param task 要执行的业务逻辑
+     * @return true 执行了任务；false 在防抖期内被拦截
+     */
+    public boolean debounce(String key, long seconds, Runnable task) {
+        try {
+            Boolean success = redisTemplate.opsForValue().setIfAbsent(
+                    key, "1", seconds, TimeUnit.SECONDS
+            );
+
+            if (Boolean.TRUE.equals(success)) {
+                task.run();
+                return true;
+            }
+            return false;
+        } catch (Exception e) {
+            log.error("防抖函数执行失败 key={} err={}", key, e.getMessage(), e);
+            return false;
+        }
+    }
+}
--- a/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml
+++ b/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml
@@ -153,10 +153,6 @@
            <foreach item="item" collection="idList" separator="," open="(" close=")">
                #{item}
            </foreach>
-            or t1.sync_id in
-            <foreach item="item" collection="idList" separator="," open="(" close=")">
-                #{item}
-            </foreach>
        </if>
        order by t1.sort desc,t1.id desc
    </select>
Author	SHA1	Message	Date
gong	fa4469b494	当面付进件修改	2026-01-08 18:18:27 +08:00
wangw	3537cf4dbd	Merge remote-tracking branch 'origin/pay' into pay	2026-01-08 17:01:47 +08:00
wangw	c7b13dcf6b	查询	2026-01-08 17:01:36 +08:00
gong	f4e82e9952	更新支付宝进件方式	2026-01-08 16:59:41 +08:00