查询关联商品 sync_id bug

优惠券详情
2026-01-22 15:57:30 +08:00 · 2026-01-21 16:10:26 +08:00 · 2026-01-21 16:06:20 +08:00 · 2026-01-21 15:51:30 +08:00 · 2026-01-21 15:33:30 +08:00 · 2026-01-21 13:36:59 +08:00
40 changed files with 280 additions and 195 deletions
--- 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
@@ -15,8 +15,11 @@ import com.czg.resp.CzgResult;
 import com.czg.sa.StpKit;
 import com.czg.task.DistributionTask;
 import com.czg.utils.AssertUtil;
+import com.czg.utils.FunUtils;
 import com.mybatisflex.core.paginate.Page;
 import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.NestedExceptionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

@@ -27,6 +30,7 @@ import java.util.Map;
 *
 * @author Administrator
 */
+@Slf4j
@RestController
@RequestMapping("/user/distribution")
 public class UDistributionController {
@@ -103,6 +107,20 @@ public class UDistributionController {
        return CzgResult.success(distributionUserService.getInviteCode(shopId, shopUserId));
    }

+    /**
+     * 分销员中心-获取邀请码
+     */
+    @GetMapping("/autoGetInviteCode")
+    public CzgResult<String> autoGetInviteCode(@RequestParam Long shopId, @RequestParam Long shopUserId) {
+        try {
+            return CzgResult.success(distributionUserService.getInviteCode(shopId, shopUserId));
+        } catch (Exception e) {
+            String rootMsg = NestedExceptionUtils.getMostSpecificCause(e).getMessage();
+            log.error("获取邀请码失败用户：{}，:{}", shopUserId, rootMsg);
+            return CzgResult.success("");
+        }
+    }
+
    /**
     * 分销员中心-实名认证
     */
@@ -115,6 +133,19 @@ public class UDistributionController {
        return CzgResult.success();
    }

+    /**
+     * 分销员中心-无感-绑定邀请人
+     */
+    @PostMapping("/autoBindInviteUser")
+    public CzgResult<Map<String, Object>> autoBindInviteUser(@RequestBody MkDistributionUserDTO param) {
+        AssertUtil.isNull(param.getId(), "店铺用户ID不能为空");
+        AssertUtil.isNull(param.getShopId(), "店铺ID不能为空");
+        AssertUtil.isNull(param.getInviteCode(), "邀请码不能为空");
+        FunUtils.asyncSafeRunVoid(() -> distributionUserService.bindInviteUser(param), "无感绑定上级");
+        return CzgResult.success();
+    }
+
+
    /**
     * 分销员中心-绑定邀请人
     */
@@ -172,10 +203,7 @@ public class UDistributionController {
    /**
     * 收益明细
     *
-     * @param startTime
-     * @param endTime
-     * @param shopId
-     * @param status    pending待入账 success已入账
+     * @param status pending待入账 success已入账
     */
    @GetMapping("/distributionFlow")
    public CzgResult<Map<String, Object>> distributionFlow(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime,
--- a/cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java
+++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java
@@ -79,7 +79,7 @@ public class UPpPackageController {
     * 取消订单
     */
    @GetMapping("/cancel")
-    public CzgResult<Boolean> cancelOrder(Long orderId) {
+    public CzgResult<Boolean> cancelOrder(@RequestParam Long orderId) {
        return CzgResult.success(ppPackageOrderService.cancelOrder(orderId));
    }

@@ -95,7 +95,7 @@ public class UPpPackageController {
     * 获取订单详情
     */
    @GetMapping("/order/detail")
-    public CzgResult<PpPackageOrderDTO> getOrderDetail(Long orderId) {
+    public CzgResult<PpPackageOrderDTO> getOrderDetail(@RequestParam Long orderId) {
        return CzgResult.success(ppPackageOrderService.getOrderDetailById(orderId, StpKit.USER.getLoginIdAsLong()));
    }

--- 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
@@ -68,7 +68,7 @@ public class NotifyController {
     */
    @RequestMapping("/native/pay/{platform}")
    public String pay(@PathVariable String platform, @RequestBody JSONObject json) {
-        if (PayCst.Platform.WECHAT.equalsIgnoreCase(platform)) {
+        if (PayCst.Type.WECHAT.equalsIgnoreCase(platform)) {
            // 微信
            WechatNotifyReqDto reqDto = JSONObject.parseObject(json.toJSONString(), WechatNotifyReqDto.class);
            log.info("【微信支付回调】收到微信支付回调 data: {}", JSONObject.toJSONString(reqDto));
@@ -80,7 +80,7 @@ public class NotifyController {
            PayNotifyRespDTO respDTO = dataDto.convertToPayNotifyRespDTO();
            orderInfoCustomService.payCallBackOrder(respDTO.getMchOrderNo(), respDTO, PayChannelCst.NATIVE, 0);
            return "success";
-        } else if (PayCst.Platform.ALIPAY.equalsIgnoreCase(platform)) {
+        } else if (PayCst.Type.ALIPAY.equalsIgnoreCase(platform)) {
            // 支付宝
            return "success";
        }
@@ -92,7 +92,7 @@ public class NotifyController {
     */
    @RequestMapping("/native/refund/{platform}")
    public String refund(@PathVariable String platform, @RequestBody JSONObject json) {
-        if (PayCst.Platform.WECHAT.equalsIgnoreCase(platform)) {
+        if (PayCst.Type.WECHAT.equalsIgnoreCase(platform)) {
            // 微信
            WechatNotifyReqDto reqDto = JSONObject.parseObject(json.toJSONString(), WechatNotifyReqDto.class);
            log.info("【微信退款回调】收到微信退款回调 data: {}", JSONObject.toJSONString(reqDto));
@@ -100,7 +100,7 @@ public class NotifyController {
            log.info("【微信退款回调】解密数据 {}", decrypted);

            return "success";
-        } else if (PayCst.Platform.ALIPAY.equalsIgnoreCase(platform)) {
+        } else if (PayCst.Type.ALIPAY.equalsIgnoreCase(platform)) {
            // 支付宝
            return "success";
        }
--- 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
@@ -30,7 +30,7 @@ public class DistributionPayController {

    /**
     * 小程序支付
-     * payType 必填  支付方式，aliPay 支付宝，wechatPay 微信
+     * payType 必填  支付方式，ALIPAY 支付宝，WECHAT 微信
     * openId  必填
     */
    @PostMapping("/ltPayOrder")
@@ -42,7 +42,7 @@ public class DistributionPayController {

    /**
     * 运营端小程序余额充值
-     * payType 必填  支付方式，aliPay 支付宝，wechatPay 微信
+     * payType 必填  支付方式，ALIPAY 支付宝，WECHAT 微信
     */
    @PostMapping("/mchRecharge")
    @Debounce(value = "#payParam.userId")
--- a/cash-api/order-server/src/main/java/com/czg/controller/pay/OrderPayController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/pay/OrderPayController.java
@@ -2,8 +2,10 @@ package com.czg.controller.pay;

 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.URLUtil;
+import com.czg.PayCst;
 import com.czg.annotation.Debounce;
 import com.czg.constants.ParamCodeCst;
+import com.czg.exception.CzgException;
 import com.czg.market.service.OrderInfoService;
 import com.czg.order.dto.CheckOrderPay;
 import com.czg.order.entity.OrderInfo;
@@ -59,7 +61,7 @@ public class OrderPayController {

    /**
     * 充值并付款
-     * payType 必填  支付方式，aliPay 支付宝，wechatPay 微信
+     * payType 必填  支付方式，ALIPAY 支付宝，WECHAT 微信
     * openId  必填
     */
    @PostMapping("/rechargePayOrder")
@@ -99,7 +101,7 @@ public class OrderPayController {
    /**
     * js支付
     * <p>
-     * payType 必填  支付方式，aliPay 支付宝，wechatPay 微信
+     * payType 必填  支付方式，ALIPAY 支付宝，WECHAT 微信
     * openId  必填
     */
    @PostMapping("/jsPay")
@@ -111,7 +113,7 @@ public class OrderPayController {

    /**
     * 小程序支付
-     * payType 必填  支付方式，aliPay 支付宝，wechatPay 微信
+     * payType 必填  支付方式，ALIPAY 支付宝，WECHAT 微信
     * openId  必填
     */
    @PostMapping("/ltPayOrder")
@@ -167,13 +169,21 @@ public class OrderPayController {
    }

    /**
-     * payType 必填  支付方式，aliPay 支付宝，wechatPay 微信
+     * 空订单支付/h5页面支付
+     * payType 必填  支付方式，ALIPAY 支付宝，WECHAT 微信
     * openId  必填
     * checkOrderPay.orderAmount 必填
     */
    @PostMapping("/shopPayApi/js2Pay")
    @Debounce(value = "#payParam.checkOrderPay.orderId")
    public CzgResult<Map<String, Object>> js2PayOrder(HttpServletRequest request, @RequestBody OrderPayParamDTO payParam) {
+        if ("alipay".equals(payParam.getPayType())) {
+            payParam.setPayType(PayCst.Type.ALIPAY);
+        } else if ("wechatPay".equals(payParam.getPayType())) {
+            payParam.setPayType(PayCst.Type.WECHAT);
+        } else {
+            throw new CzgException(payParam.getPayType() + "支付方式错误");
+        }
        return orderPayService.js2PayOrder(ServletUtil.getClientIP(request), payParam);
    }

--- a/cash-api/order-server/src/main/java/com/czg/controller/pay/VipPayController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/pay/VipPayController.java
@@ -53,7 +53,7 @@ public class VipPayController {

    /**
     * js支付
-     * payType 必填  支付方式，aliPay 支付宝，wechatPay 微信
+     * payType 必填  支付方式，ALIPAY 支付宝，WECHAT 微信
     * openId  必填
     */
    @PostMapping("/jsPayVip")
@@ -66,7 +66,7 @@ public class VipPayController {

    /**
     * 小程序支付
-     * payType 必填  支付方式，aliPay 支付宝，wechatPay 微信
+     * payType 必填  支付方式，ALIPAY 支付宝，WECHAT 微信
     * openId  必填
     */
    @PostMapping("/ltPayVip")
@@ -139,6 +139,7 @@ public class VipPayController {
    }

    /**
+     * 会员退款
     * cashRefund 是否是现金退款
     * 会员退款(先调用 退款前置接口 refundVipBefore)
     * 最大退款金额为 充值金额 inAmount
--- a/cash-api/order-server/src/main/java/com/czg/controller/user/UGbOrderController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/user/UGbOrderController.java
@@ -90,7 +90,7 @@ public class UGbOrderController {
    /**
     * 生成订单
     * 小程序支付
-     * payType 必填  支付方式，aliPay 支付宝，wechatPay 微信
+     * payType 必填  支付方式，ALIPAY 支付宝，WECHAT 微信
     * openId  必填
     */
    @PostMapping("/exchange")
--- a/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java
@@ -1,8 +1,11 @@
 package com.czg.controller.user;

+import com.czg.market.entity.MkPointsGoods;
 import com.czg.market.entity.MkPointsGoodsRecord;
+import com.czg.market.entity.ShopCoupon;
 import com.czg.market.service.MkPointsGoodsRecordService;
 import com.czg.market.service.MkPointsGoodsService;
+import com.czg.market.service.ShopCouponService;
 import com.czg.order.dto.CommonRefundDTO;
 import com.czg.order.dto.LtPayOtherDTO;
 import com.czg.order.service.PointsGoodPayService;
@@ -34,6 +37,8 @@ public class UPointGoodsController {
    private MkPointsGoodsRecordService goodsRecordService;
    @Resource
    private PointsGoodPayService goodPayService;
+    @Resource
+    private ShopCouponService shopCouponService;

    /**
     * 商品列表
@@ -51,10 +56,26 @@ public class UPointGoodsController {
        return CzgResult.success(data);
    }

+    /**
+     * 商品详情
+     */
+    @GetMapping("/{id}")
+    public CzgResult<MkPointsGoods> getPointsGoodsSettingById(@PathVariable("id") Long id) {
+        MkPointsGoods goods = pointsGoodsService.getById(id);
+        if ("优惠券".equals(goods.getGoodsCategory())) {
+            ShopCoupon one = shopCouponService.getOne(QueryWrapper.create().eq(ShopCoupon::getId, goods.getCouponId())
+                    .eq(ShopCoupon::getShopId, goods.getShopId())
+                    .eq(ShopCoupon::getStatus, 1)
+                    .eq(ShopCoupon::getIsDel, 0));
+            goods.setCouponInfo(one);
+        }
+        return CzgResult.success(goods);
+    }
+
    /**
     * 生成订单
     * 小程序支付
-     * payType 必填  支付方式，aliPay 支付宝，wechatPay 微信
+     * payType 必填  支付方式，ALIPAY 支付宝，WECHAT 微信
     * openId  必填
     */
    @PostMapping("/exchange")
--- a/cash-api/order-server/src/main/java/com/czg/controller/user/UPpOrderController.java
+++ b/cash-api/order-server/src/main/java/com/czg/controller/user/UPpOrderController.java
@@ -45,7 +45,7 @@ public class UPpOrderController {

    /**
     * 小程序支付
-     * payType 必填  支付方式，aliPay 支付宝，wechatPay 微信
+     * payType 必填  支付方式，ALIPAY 支付宝，WECHAT 微信
     * openId  必填
     */
    @PostMapping("/pay")
--- a/cash-api/order-server/src/main/java/com/czg/mq/EntryManagerMqListener.java
+++ b/cash-api/order-server/src/main/java/com/czg/mq/EntryManagerMqListener.java
@@ -62,11 +62,11 @@ public class EntryManagerMqListener {
            channel.basicNack(deliveryTag, false, false);
            return;
        }
-        Long shopId = Long.valueOf(split[0]);
-        if (shopId == null) {
+        if (split[0]==null) {
            channel.basicNack(deliveryTag, false, false);
            return;
        }
+        Long shopId = Long.valueOf(split[0]);
        if (hasMessageId(msg)) {
            return;
        }
@@ -81,10 +81,10 @@ public class EntryManagerMqListener {
                EntryManager.uploadParamImage(entry);
                List<String> platform = new ArrayList<>();
                if (PayCst.EntryStatus.WAIT.equals(entry.getAlipayStatus())) {
-                    platform.add(PayCst.Platform.ALIPAY);
+                    platform.add(PayCst.Type.ALIPAY);
                }
                if (PayCst.EntryStatus.WAIT.equals(entry.getWechatStatus())) {
-                    platform.add(PayCst.Platform.WECHAT);
+                    platform.add(PayCst.Type.WECHAT);
                }
                EntryRespDto resp = EntryManager.entryMerchant(entry, platform.toArray(new String[0]));
                ShopDirectMerchant merchant = new ShopDirectMerchant();
--- a/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java
+++ b/cash-common/cash-common-api-config/src/main/java/com/czg/exception/CzgControllerAdvice.java
@@ -8,6 +8,7 @@ import com.czg.resp.CzgRespCode;
 import com.czg.resp.CzgResult;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.support.DefaultMessageSourceResolvable;
+import org.springframework.core.NestedExceptionUtils;
 import org.springframework.dao.DuplicateKeyException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.converter.HttpMessageNotReadableException;
@@ -164,20 +165,23 @@ public class CzgControllerAdvice {
    @ResponseStatus(HttpStatus.OK)
    public CzgResult<Object> errorHandler(Exception ex) {
        log.error("系统未处理异常", ex);
-        Throwable rootCause = ex;
-        while (rootCause.getCause() != null && !(rootCause instanceof CzgException)) {
-            rootCause = rootCause.getCause();
-        }
+        String rootMsg = NestedExceptionUtils.getMostSpecificCause(ex).getMessage();
+        return CzgResult.failure(CzgRespCode.FAILURE.getCode(), rootMsg);

-        // 2. 如果根因是CzgException，直接抛出/返回该异常
-        if (rootCause instanceof CzgException exception) {
-            return CzgResult.failure(exception.getCode(), exception.getMsg());
-        }else if (rootCause instanceof ValidateException exception) {
-            return CzgResult.failure(exception.getStatus(), exception.getMessage());
-        }
+//        Throwable rootCause = ex;
+//        while (rootCause.getCause() != null && !(rootCause instanceof CzgException)) {
+//            rootCause = rootCause.getCause();
+//        }
+//
+//        // 2. 如果根因是CzgException，直接抛出/返回该异常
+//        if (rootCause instanceof CzgException exception) {
+//            return CzgResult.failure(exception.getCode(), exception.getMsg());
+//        }else if (rootCause instanceof ValidateException exception) {
+//            return CzgResult.failure(exception.getStatus(), exception.getMessage());
+//        }

        // 3. 非业务异常，按原有逻辑处理
-        return CzgResult.failure(CzgRespCode.SYSTEM_ERROR.getCode(), "系统错误，请联系管理员");
+//        return CzgResult.failure(CzgRespCode.SYSTEM_ERROR.getCode(), "系统错误，请联系管理员");
    }

    private void setErrorLog(Exception ex) {
--- a/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java
+++ b/cash-common/cash-common-mq/src/main/java/com/czg/config/RabbitPublisher.java
@@ -56,8 +56,8 @@ public class RabbitPublisher {
     * @param orderId    订单id
     * @param printOrder 是否打印结算单
     */
-    public void sendOrderPrintMsg(String orderId, boolean printOrder) {
-        log.info("开始发送打印mq消息, orderId: {}, printOrder: {}", orderId, printOrder);
+    public void sendOrderPrintMsg(String orderId, boolean printOrder, String source) {
+        log.info("开始发送打印mq消息, orderId: {}, printOrder: {}, source: {}", orderId, printOrder, source);
        //厨房票
        sendMsg(RabbitConstants.Queue.ORDER_MACHINE_PRINT_QUEUE, new JSONObject().fluentPut("orderId", orderId).fluentPut("printOrder", printOrder).toString());
        //前台票
@@ -108,8 +108,9 @@ public class RabbitPublisher {
     * 1,2,sendMarkSms 发送营销短信    shop_id,sms_push_event.id,sendMarkSms
     * 1,2,sendWechatTemp 发送微信模版消息  shop_id,ac_push_event.id,sendWechatTemp
     * 1,2,groupBuyYes 发送微信模版消息     shop_id,gb_order.id,groupBuyYes
+     *
     * @param param 店铺Id,主键Id
-     * @param type applySmsTemp,sendMarkSms,sendWechatTemp,groupBuyYes
+     * @param type  applySmsTemp,sendMarkSms,sendWechatTemp,groupBuyYes
     */
    public void sendApplySmsMsg(String param, String type) {
        sendMsg(RabbitConstants.Queue.APPLY_SMS_TEMPLATE_QUEUE, param + "," + type);
--- a/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java
+++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/config/SaTokenConfigure.java
@@ -43,7 +43,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
        userConfig.setIsShare(true);
 //        config2.setTimeout(2000);
        userConfig.setTokenStyle("simple-uuid");
-        MyStpLogic.CLIENT_LOGIC.setConfig(userConfig);
+        MyStpLogic.USER_LOGIC.setConfig(userConfig);
    }

    @PostConstruct
@@ -62,21 +62,25 @@ public class SaTokenConfigure implements WebMvcConfigurer {
            // 重置根路径，防止satoken切割根路径导致匹配不到路径
            ApplicationInfo.routePrefix = "";

-            SaRouter.match("/user/**").notMatch("/user/login", "/user/test", "/user/geo/**", "/user/home/**", "/user/home/**", "/user/dict/**", "/user/openId")
-                    .notMatch("/pay/**")
-                    .notMatch("/notify/**")
-                    .check(r -> MyStpLogic.CLIENT_LOGIC.checkLogin())
-                    .setHit(true)
-//                    .match("/**")
-                    .notMatch("/user/**")
-                    .notMatch("/pay/**")
-                    .notMatch("/notify/**")
-                    .notMatch("/admin/auth/**")
-                    .notMatch("/admin/shopMsgPush/subscribe/**")
-                    .notMatch("/admin/coupon/grant")
+            SaRouter
+                    // 完全开放的路径（不需要任何认证）
+                    .match("/user/login", "/user/geo/**", "/user/home/**",
+                            "/user/dict/**", "/user/openId","/admin/auth/**",
+                            "/admin/shopMsgPush/subscribe/**",
+                            "/admin/coupon/grant",
+                            "/pay/**",
+                            "/notify/**")
+                    .stop()  // 直接放行，不检查登录
+
+                    // 用户认证路径
+                    .match("/user/**")
+                    .check(r -> MyStpLogic.USER_LOGIC.checkLogin())
+
+                    // 管理端认证（内网IP免认证）
+                    .match("/**")
                    .check(r -> {
-                        ServletRequestAttributes attributes =
-                                (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+                        ServletRequestAttributes attributes = (ServletRequestAttributes)
+                                RequestContextHolder.getRequestAttributes();
                        if (attributes == null || (!ServletUtil.getClientIP(attributes.getRequest()).contains("192.168") && !ServletUtil.getClientIP(attributes.getRequest()).contains("127.0.0.1"))) {
                            MyStpLogic.ADMIN_LOGIC.checkLogin();
                        }
--- a/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java
+++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java
@@ -27,7 +27,7 @@ import java.util.function.Consumer;
@Slf4j
@Getter
 public class MyStpLogic {
-    public static final StpLogic CLIENT_LOGIC = new StpLogic("client");
+    public static final StpLogic USER_LOGIC = new StpLogic("user");
    public static final StpLogic ADMIN_LOGIC = new StpLogic("admin");

    public Object isPC() {
@@ -42,7 +42,7 @@ public class MyStpLogic {
    private StpLogic getLogic() {
        boolean hit = SaRouter.match("/user/**").isHit();
        if (hit) {
-            return CLIENT_LOGIC;
+            return USER_LOGIC;
        }
        return ADMIN_LOGIC;
    }
--- a/cash-common/cash-common-service/src/main/java/com/czg/constants/SystemConstants.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/constants/SystemConstants.java
@@ -46,18 +46,9 @@ public interface SystemConstants {


    /**
-     * 三方支付类型
+     * 小程序APPID
     */
-    class PayType {
-        /**
-         * 微信支付
-         */
-        public static final String WECHAT = "wechatPay";
-
-        /**
-         * 支付宝支付
-         */
-        public static final String ALIPAY = "alipay";
+    class PayAppId {

        /**
         * 微信小程序支付
--- 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
@@ -51,7 +51,7 @@ public interface MkDistributionUserService extends IService<MkDistributionUser>
    /**
     * 分销员中心-获取邀请码
     */
-    String getInviteCode(Long shopId, Long shopUserId);
+    String getInviteCode(Long shopId, Long shopUserId)  throws CzgException, ValidateException ;

    /**
     * 分销员中心-实名认证
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/LtPayOtherDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/LtPayOtherDTO.java
@@ -9,7 +9,7 @@ import java.math.BigDecimal;

 /**
 * 小程序支付 其它类型
- * payType 必填  支付方式，aliPay 支付宝，wechatPay 微信
+ * payType 必填  支付方式，ALIPAY 支付宝，WECHAT 微信
 * openId  必填
 * @author ww
 */
@@ -32,7 +32,7 @@ public class LtPayOtherDTO {
    @NotNull(message = "兑换数量不能为空")
    private int number;
    /**
-     * 支付方式 支付方式，aliPay 支付宝，wechatPay 微信
+     * 支付方式，ALIPAY 支付宝，WECHAT 微信
     */
    private String payType;
    /**
@@ -58,8 +58,13 @@ public class LtPayOtherDTO {
     * 对应的记录Id 支付回调向该内容进行回填
     * 积分商品为 mk_points_goods_record 主键id
     * 团购商品为 gb_order_detail 主键id
+     *
     */
    private Long recordId;
+    /**
+     * 霸王餐充值为 订单id 会员充值为 活动id
+     */
+    private Long relatedId;

    public void checkPayInfo(){
        AssertUtil.isBlank(payType, "支付方式不能为空");
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/dto/MkDistributionPayDTO.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/dto/MkDistributionPayDTO.java
@@ -1,7 +1,6 @@

 package com.czg.order.dto;

-import jakarta.validation.constraints.NotNull;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -26,7 +25,7 @@ public class MkDistributionPayDTO implements Serializable {
    private Long userId;
    /**
     * 支付类型
-     * {@link com.czg.constants.SystemConstants.PayType}
+     * {@link com.czg.PayCst.Type}
     */
    private String payType;
    private String returnUrl;
--- a/cash-common/cash-common-tools/src/main/java/com/czg/utils/FunUtils.java
+++ b/cash-common/cash-common-tools/src/main/java/com/czg/utils/FunUtils.java
@@ -3,6 +3,7 @@ package com.czg.utils;
 import cn.hutool.core.lang.func.Func0;
 import cn.hutool.core.thread.ThreadUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.NestedExceptionUtils;
 import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;

@@ -27,11 +28,17 @@ public class FunUtils {
        return value;
    }

+    public static void asyncSafeRunVoid(Runnable func, String... msg) {
+        ThreadUtil.execAsync(() -> safeRunVoid(func, msg));
+    }
+
+
    public static void safeRunVoid(Runnable func, String... msg) {
        try {
            func.run();
        } catch (Exception e) {
-            log.warn(msg.length > 0 ? msg[0] : "方法执行失败: {}", e.getMessage());
+            String message = NestedExceptionUtils.getMostSpecificCause(e).getMessage();
+            log.warn((msg.length > 0 ? msg[0] : "方法执行失败") + ": " + message);
        }
    }

@@ -43,10 +50,6 @@ public class FunUtils {
        }
    }

-    public static void asyncSafeRunVoid(Runnable func, String... msg) {
-        ThreadUtil.execAsync(() -> safeRunVoid(func, msg));
-    }
-
    /**
     * 在事务提交后执行方法
     * 异步 执行
--- a/cash-sdk/aggregation-pay/src/main/java/com/czg/EntryManager.java
+++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/EntryManager.java
@@ -80,13 +80,13 @@ public class EntryManager {
        List<Supplier<EntryThirdRespDto>> tasks = new ArrayList<>();

        if (platform == null || platform.length == 0) {
-            platform = new String[]{PayCst.Platform.WECHAT, PayCst.Platform.ALIPAY};
+            platform = new String[]{PayCst.Type.WECHAT, PayCst.Type.ALIPAY};
        }

-        if (ArrayUtil.contains(platform, PayCst.Platform.WECHAT)) {
+        if (ArrayUtil.contains(platform, PayCst.Type.WECHAT)) {
            tasks.add(() -> WechatEntryManager.entryMerchant(null, reqDto));
        }
-        if (ArrayUtil.contains(platform, PayCst.Platform.ALIPAY)) {
+        if (ArrayUtil.contains(platform, PayCst.Type.ALIPAY)) {
            tasks.add(() -> AlipayIsvEntryManager.entryMerchant(null, reqDto));
        }

@@ -102,11 +102,11 @@ public class EntryManager {
        for (AsyncTaskExecutor.TaskResult<EntryThirdRespDto> result : results) {
            // 合并两个进件结果
            EntryThirdRespDto respDto = result.result();
-            if (PayCst.Platform.WECHAT.equals(respDto.getPlatform())) {
+            if (PayCst.Type.WECHAT.equals(respDto.getPlatform())) {
                entryRespDto.setWechatApplyId(respDto.getEntryId());
                entryRespDto.setWechatStatus(respDto.getStatus());
                entryRespDto.setWechatErrorMsg(respDto.getErrorMsg());
-            } else if (PayCst.Platform.ALIPAY.equals(respDto.getPlatform())) {
+            } else if (PayCst.Type.ALIPAY.equals(respDto.getPlatform())) {
                entryRespDto.setAlipayOrderId(respDto.getEntryId());
                entryRespDto.setAlipayStatus(respDto.getStatus());
                entryRespDto.setAlipayErrorMsg(respDto.getErrorMsg());
@@ -384,9 +384,9 @@ public class EntryManager {
 //        verifyEntryParam(merchantDto);
 //        uploadParamImage(merchantDto);
 ////        System.out.println(merchantDto);
-        EntryRespDto respDto = entryMerchant(merchantDto, PayCst.Platform.WECHAT);
-//        entryMerchant(merchantDto, PayCst.Platform.ALIPAY);
-//        entryMerchant(merchantDto, PayCst.Platform.WECHAT, PayCst.Platform.ALIPAY);
+        EntryRespDto respDto = entryMerchant(merchantDto, PayCst.Type.WECHAT);
+//        entryMerchant(merchantDto, PayCst.Type.ALIPAY);
+//        entryMerchant(merchantDto, PayCst.Type.WECHAT, PayCst.Type.ALIPAY);
        System.out.println(respDto);
    }

--- a/cash-sdk/aggregation-pay/src/main/java/com/czg/PayCst.java
+++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/PayCst.java
@@ -21,15 +21,16 @@ public interface PayCst {
    String ALIPAY_ERROR_MSG_KEY = "message";

    /**
-     * 平台
+     * 支付类型
     */
-    class Platform {
+    class Type {
        /**
-         * 微信
+         * 微信支付
         */
        public static final String WECHAT = "WECHAT";
+
        /**
-         * 支付宝
+         * 支付宝支付
         */
        public static final String ALIPAY = "ALIPAY";
    }
--- a/cash-sdk/aggregation-pay/src/main/java/com/czg/PayManager.java
+++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/PayManager.java
@@ -1,6 +1,5 @@
 package com.czg;

-import com.czg.constants.SystemConstants;
 import com.czg.exception.CzgException;
 import com.czg.pay.*;
 import com.czg.third.alipay.AlipayIsvPayManager;
@@ -21,9 +20,9 @@ public class PayManager {
     * @return 结果
     */
    public static Map<String, Object> jsapiPay(CzgPayBaseReq paramsDto, NativeMerchantDTO merchantDTO) {
-        if (SystemConstants.PayType.WECHAT.equals(paramsDto.getPayType())) {
+        if (PayCst.Type.WECHAT.equals(paramsDto.getPayType())) {
            return WechatPayManager.jsapiPay(null, paramsDto, merchantDTO);
-        } else if (SystemConstants.PayType.ALIPAY.equals(paramsDto.getPayType())) {
+        } else if (PayCst.Type.ALIPAY.equals(paramsDto.getPayType())) {
            return AlipayIsvPayManager.jsapiPay(null, paramsDto, merchantDTO);
        } else {
            throw new CzgException("不支持的支付平台");
@@ -37,9 +36,9 @@ public class PayManager {
     * @return 结果
     */
    public static Map<String, Object> barPay(CzgPayBaseReq paramsDto, NativeMerchantDTO merchantDTO) {
-        if (SystemConstants.PayType.WECHAT.equals(paramsDto.getPayType())) {
+        if (PayCst.Type.WECHAT.equals(paramsDto.getPayType())) {
            return WechatPayManager.barPay(null, paramsDto, merchantDTO);
-        } else if (SystemConstants.PayType.ALIPAY.equals(paramsDto.getPayType())) {
+        } else if (PayCst.Type.ALIPAY.equals(paramsDto.getPayType())) {
            return AlipayIsvPayManager.barPay(null, paramsDto, merchantDTO);
        } else {
            throw new CzgException("不支持的支付平台");
@@ -50,9 +49,9 @@ public class PayManager {
     * 查询订单状态
     */
    public static QueryOrderRespDTO queryOrderStatus(String platform, String orderNo, NativeMerchantDTO merchantDTO) {
-        if (SystemConstants.PayType.WECHAT.equals(platform)) {
+        if (PayCst.Type.WECHAT.equals(platform)) {
            return WechatPayManager.queryOrder(null, orderNo, merchantDTO);
-        } else if (SystemConstants.PayType.ALIPAY.equals(platform)) {
+        } else if (PayCst.Type.ALIPAY.equals(platform)) {
            return AlipayIsvPayManager.queryOrder(null, orderNo, merchantDTO);
        } else {
            throw new CzgException("不支持的支付平台");
@@ -63,9 +62,9 @@ public class PayManager {
     * 退款
     */
    public static RefundRespDTO refund(CzgRefundReq paramsDto, String notifyUrl, NativeMerchantDTO merchantDTO) {
-        if (PayCst.Platform.WECHAT.equals(paramsDto.getPlatform())) {
+        if (PayCst.Type.WECHAT.equals(paramsDto.getPlatform())) {
            return WechatPayManager.refundOrder(null, paramsDto, notifyUrl, merchantDTO);
-        } else if (PayCst.Platform.ALIPAY.equals(paramsDto.getPlatform())) {
+        } else if (PayCst.Type.ALIPAY.equals(paramsDto.getPlatform())) {
            return AlipayIsvPayManager.refundOrder(null, paramsDto, notifyUrl, merchantDTO);
        } else {
            throw new CzgException("不支持的支付平台");
--- a/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/req/PayParamsDto.java
+++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/req/PayParamsDto.java
@@ -106,9 +106,9 @@ public class PayParamsDto {
        AssertUtil.isBlank(appId, "appId不能为空");
        AssertUtil.isBlank(openId, "用户唯一标识不能为空");

-        if (PayCst.Platform.WECHAT.equals(platform)) {
+        if (PayCst.Type.WECHAT.equals(platform)) {
            AssertUtil.isBlank(merchantId, "商户ID不能为空");
-        } else if (PayCst.Platform.ALIPAY.equals(platform)) {
+        } else if (PayCst.Type.ALIPAY.equals(platform)) {
            AssertUtil.isBlank(payParams, "支付参数不能为空");
            alipayAuthInfo = JSONObject.parseObject(payParams, AlipayAuthInfoDto.class);
            AssertUtil.isNull(alipayAuthInfo, "支付参数错误");
--- a/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/req/WechatPayNotifyDataDto.java
+++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/dto/req/WechatPayNotifyDataDto.java
@@ -129,7 +129,7 @@ public class WechatPayNotifyDataDto {
                .setMchOrderNo(outTradeNo)
                .setThirdOrderNo(transactionId)
                .setAmount(getPayAmount())
-                .setPlatform(PayCst.Platform.WECHAT)
+                .setPlatform(PayCst.Type.WECHAT)
                .setExtData(attach)
                .setPaySuccessTime(time)
                .setErrorMsg(tradeStateDesc);
--- 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
@@ -31,7 +31,6 @@ 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.third.wechat.dto.resp.WechatQueryStateResp;
 import com.czg.utils.UploadFileUtil;
 import lombok.extern.slf4j.Slf4j;

@@ -60,7 +59,7 @@ public class AlipayEntryManager {
     */
    public static QueryStatusResp queryMerchantEntryStatus(AlipayConfigDto configDto, String merchantCode) {
        QueryStatusResp queryStatusResp = new QueryStatusResp();
-        queryStatusResp.setPlatform(PayCst.Platform.ALIPAY);
+        queryStatusResp.setPlatform(PayCst.Type.ALIPAY);
        queryStatusResp.setMerchantCode(merchantCode);

        AntMerchantExpandIndirectZftorderQueryRequest request = new AntMerchantExpandIndirectZftorderQueryRequest();
@@ -158,7 +157,7 @@ public class AlipayEntryManager {
    public static EntryThirdRespDto entryMerchant(AlipayConfigDto configDto, AggregateMerchantDto reqDto) {
        AntMerchantExpandIndirectZftCreateModel entryReqDto = buildEntryParams(reqDto);
        EntryThirdRespDto respDto = new EntryThirdRespDto()
-                .setPlatform(PayCst.Platform.ALIPAY);
+                .setPlatform(PayCst.Type.ALIPAY);

        try {
            AntMerchantExpandIndirectZftCreateRequest request = new AntMerchantExpandIndirectZftCreateRequest();
--- 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
@@ -30,7 +30,7 @@ public class AlipayIsvEntryManager {
            configDto = AlipayConfigDto.getThirdDefaultConfig();
        }
        QueryStatusResp respDto = new QueryStatusResp()
-                .setPlatform(PayCst.Platform.ALIPAY);
+                .setPlatform(PayCst.Type.ALIPAY);
        AlipayClient.setApiClient(configDto);

        try {
@@ -104,7 +104,7 @@ public class AlipayIsvEntryManager {
        }
        AlipayClient.setApiClient(configDto);
        EntryThirdRespDto respDto = new EntryThirdRespDto()
-                .setPlatform(PayCst.Platform.ALIPAY);
+                .setPlatform(PayCst.Type.ALIPAY);
        try {
            String batchNo = createRequest(configDto, reqDto);
            respDto.setEntryId(batchNo);
--- a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvPayManager.java
+++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/alipay/AlipayIsvPayManager.java
@@ -43,7 +43,7 @@ public class AlipayIsvPayManager {
            model.setTotalAmount(getYuanAmountByFen(paramsDto.getAmount()));
            model.setSubject(paramsDto.getSubject());
            model.setBody(paramsDto.getBody());
-            model.setNotifyUrl(paramsDto.getNotifyUrl() + "/" + PayCst.Platform.ALIPAY);
+            model.setNotifyUrl(paramsDto.getNotifyUrl() + "/" + PayCst.Type.ALIPAY);

            model.setExtendParams(new ExtendParams());
            CustomizedParams customizedParams = new CustomizedParams();
--- 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
@@ -1,7 +1,6 @@
 package com.czg.third.wechat;

 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.alibaba.fastjson2.JSONWriter;
 import com.czg.PayCst;
@@ -15,7 +14,10 @@ import com.czg.third.wechat.dto.req.entry.*;
 import com.czg.third.wechat.dto.req.entry.business.WechatEntryBusinessReqDto;
 import com.czg.third.wechat.dto.req.entry.business.WechatEntryIdentityReqDto;
 import com.czg.third.wechat.dto.req.entry.business.WechatEntryLicenseReqDto;
-import com.czg.third.wechat.dto.req.entry.business.sales.*;
+import com.czg.third.wechat.dto.req.entry.business.sales.WechatEntryMiniProgramReqDto;
+import com.czg.third.wechat.dto.req.entry.business.sales.WechatEntrySalesInfoReqDto;
+import com.czg.third.wechat.dto.req.entry.business.sales.WechatEntryStoreInfoReqDto;
+import com.czg.third.wechat.dto.req.entry.business.sales.WechatEntryWebInfoReqDto;
 import com.czg.third.wechat.dto.req.entry.id.WechatEntryIdCardReqDto;
 import com.czg.third.wechat.dto.resp.WechatAuditDetail;
 import com.czg.third.wechat.dto.resp.WechatQueryStateResp;
@@ -50,7 +52,7 @@ public class WechatEntryManager {
     */
    public static QueryStatusResp queryMerchantEntryStatus(WechatPayConfigDto configDto, String applyId) {
        QueryStatusResp queryStatusResp = new QueryStatusResp();
-        queryStatusResp.setPlatform(PayCst.Platform.WECHAT);
+        queryStatusResp.setPlatform(PayCst.Type.WECHAT);
        queryStatusResp.setMerchantCode(applyId);

        String resp = WechatReqUtils.getReq(configDto, "/v3/applyment4sub/applyment/applyment_id/" + applyId, Map.of());
@@ -109,7 +111,7 @@ public class WechatEntryManager {
     */
    public static EntryThirdRespDto entryMerchant(WechatPayConfigDto configDto, AggregateMerchantDto reqDto) {
        EntryThirdRespDto respDto = new EntryThirdRespDto()
-                .setPlatform(PayCst.Platform.WECHAT);
+                .setPlatform(PayCst.Type.WECHAT);
        try {
            WechatEntryReqDto entryReqDto = buildEntryParams(configDto, reqDto);
            log.info("微信进件参数：{}", JSONObject.toJSONString(entryReqDto));
--- a/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatPayManager.java
+++ b/cash-sdk/aggregation-pay/src/main/java/com/czg/third/wechat/WechatPayManager.java
@@ -56,7 +56,7 @@ public class WechatPayManager {
            reqData.put("sub_mchid", merchantDTO.getWechatMerchantId());
            reqData.put("description", paramsDto.getSubject());
            reqData.put("out_trade_no", paramsDto.getMchOrderNo());
-            reqData.put("notify_url", paramsDto.getNotifyUrl() + "/" + PayCst.Platform.WECHAT);
+            reqData.put("notify_url", paramsDto.getNotifyUrl() + "/" + PayCst.Type.WECHAT);
            reqData.put("attach", paramsDto.getExtParam());

            JSONObject amount = new JSONObject();
@@ -267,7 +267,7 @@ public class WechatPayManager {
            refundParam.put("out_trade_no", paramsDto.getMchOrderNo());
            refundParam.put("out_refund_no", paramsDto.getMchRefundNo());
            refundParam.put("reason", paramsDto.getRefundReason());
-            refundParam.put("notify_url", notifyUrl + "/" + PayCst.Platform.WECHAT);
+            refundParam.put("notify_url", notifyUrl + "/" + PayCst.Type.WECHAT);

            JSONObject amount = new JSONObject();
            amount.put("total", paramsDto.getOrderTotalAmount());
@@ -291,7 +291,7 @@ public class WechatPayManager {
                    .setThirdRefundNo(object.getString("refund_id"))
                    .setRefundTime(object.getString("success_time"))
                    .setOriginalData(resp)
-                    .setPlatform(PayCst.Platform.WECHAT);
+                    .setPlatform(PayCst.Type.WECHAT);

            JSONObject resAmount = object.getJSONObject("amount");
            if (resAmount != null) {
--- a/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml
+++ b/cash-service/account-service/src/main/resources/mapper/ShopTableMapper.xml
@@ -27,7 +27,7 @@
            and a.table_code is not null
        </if>
        group by a.id
-        ORDER BY a.create_time
+        ORDER BY a.area_id,a.id

    </select>
 </mapper>
--- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/BaseWx.java
+++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/BaseWx.java
@@ -5,7 +5,6 @@ import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson2.JSONObject;
-import com.czg.constants.ParamCodeCst;
 import com.czg.exception.CzgException;
 import com.czg.service.RedisService;
 import com.ijpay.core.IJPayHttpResponse;
@@ -35,7 +34,6 @@ import java.security.cert.X509Certificate;
 import java.util.Base64;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Set;

 /**
 * 微信支付相关
@@ -139,12 +137,13 @@ public abstract class BaseWx {
            JSONObject jsonObject = JSONObject.parseObject(body);
            String prepayId = jsonObject.getString("prepay_id");
            if (StrUtil.isBlank(prepayId)) {
-                throw new RuntimeException(jsonObject.getString("message"));
+                throw new CzgException(jsonObject.getString("message"));
            }
            return WxPayKit.jsApiCreateSign(config.appId, prepayId, config.privateKey);

        } catch (Exception e) {
-            throw new RuntimeException(e);
+            log.error("微信V3原生支付失败", e);
+            throw new CzgException("暂无法支付,请联系管理员");
        }
    }

--- 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
@@ -198,18 +198,18 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse

    @Override
    @Transactional(rollbackFor = Exception.class)
-    public String getInviteCode(Long shopId, Long shopUserId) {
+    public String getInviteCode(Long shopId, Long shopUserId) throws CzgException, ValidateException {
        ShopUser shopUser = shopUserService.getById(shopUserId);
        AssertUtil.isNull(shopUser, "店铺用户不存在");
        MkDistributionConfigVO mkDistributionConfigVO = mkDistributionConfigService.detail(shopId);
        if (mkDistributionConfigVO == null || mkDistributionConfigVO.getIsEnable() == 0) {
            throw new CzgException("店铺分销功能未开启");
        }
-        if (!"auto".equals(mkDistributionConfigVO.getOpenType())) {
-            throw new CzgException("该店铺不可自行成为分销员");
-        }
        MkDistributionUser mkDistributionUser = getMkDistributionUserByIdAndShopId(shopUser.getId(), shopId);
        if (mkDistributionUser == null) {
+            if (!"auto".equals(mkDistributionConfigVO.getOpenType())) {
+                throw new CzgException("该店铺不可自行成为分销员");
+            }
            mkDistributionUser = new MkDistributionUser();
            mkDistributionUser.setId(shopUser.getId());
            mkDistributionUser.setShopId(shopId);
@@ -732,7 +732,7 @@ public class MkDistributionUserServiceImpl extends ServiceImpl<MkDistributionUse
    /**
     * 分销金额修改
     *
-     * @param pendingIncome 待入账金额
+     * @param pendingIncome  待入账金额
     * @param receivedIncome 已入账
     * @param withdrawIncome 已提现
     */
--- 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
@@ -1,13 +1,13 @@
 package com.czg.service.order.service.impl;

 import cn.hutool.core.util.IdUtil;
+import com.czg.PayCst;
 import com.czg.account.entity.ShopUser;
 import com.czg.account.entity.UserInfo;
 import com.czg.account.service.ShopUserService;
 import com.czg.account.service.UserInfoService;
 import com.czg.constant.TableValueConstant;
 import com.czg.constants.PayTypeConstants;
-import com.czg.constants.SystemConstants;
 import com.czg.enums.CzgPayEnum;
 import com.czg.exception.CzgException;
 import com.czg.market.service.MkDistributionConfigService;
@@ -83,7 +83,7 @@ public class DistributionPayServiceImpl implements DistributionPayService {
        } else {
            UserInfo userInfo = userInfoService.getById(userId);
            initInfo.setPayment(orderPayment).setShopUser(shopUserInfo)
-                    .setOpenId(SystemConstants.PayType.ALIPAY.equals(payParam.getPayType()) ? userInfo.getAlipayOpenId() : userInfo.getWechatOpenId());
+                    .setOpenId(PayCst.Type.ALIPAY.equals(payParam.getPayType()) ? userInfo.getAlipayOpenId() : userInfo.getWechatOpenId());
        }
        return initInfo;
    }
--- 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
@@ -327,7 +327,7 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
            //发送打票信息 后付费推送多次 需要处理
            //orderId_0_0  订单ID_先付后付(1先付0后付)_订单状态 0未完成 1完成
            //orderInfo.getId() + "_" + (!"after-pay".equals(orderInfo.getPayMode()) ? 1 : 0) + "_0"
-            rabbitPublisher.sendOrderPrintMsg(orderInfo.getId() + "_0_0", false);
+            rabbitPublisher.sendOrderPrintMsg(orderInfo.getId() + "_0_0", false, "后付费打印");
        } else {
            redisService.set(RedisCst.classKeyExpired.EXPIRED_ORDER + orderInfo.getId(), "", 60 * 15);
        }
@@ -1066,10 +1066,27 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
                    // 分销奖励
                    distributionUserService.distribute(orderInfo.getId(), orderInfo.getOrderNo(), payment.getAmount(), orderInfo.getUserId(), orderInfo.getShopId(), "order");
                }
-            } else if (PayTypeConstants.SourceType.MEMBER_IN.equals(payment.getSourceType()) || PayTypeConstants.SourceType.FREE.equals(payment.getSourceType())) {
-                boolean isFree = PayTypeConstants.SourceType.FREE.equals(payment.getSourceType());
+            } else if (PayTypeConstants.SourceType.FREE.equals(payment.getSourceType())) {
+                ShopUser shopUser = shopUserService.getById(payment.getSourceId());
+                if (shopUser == null) {
+                    log.error("霸王餐回调失败，会员不存在，会员id：{}", payment.getSourceId());
+                } else {
+                    OrderInfo orderInfo = orderInfoService.getOne(new QueryWrapper().eq(OrderInfo::getId, payment.getRelatedId()));
+                    if (orderInfo == null) {
+                        log.error("霸王餐支付，订单不存在，支付记录Id,{}", payment.getId());
+                    } else {
+                        //增加余额
+                        ShopUserMoneyEditDTO shopUserMoneyEditDTO = new ShopUserMoneyEditDTO()
+                                .setId(shopUser.getId()).setType(1)
+                                .setBizEnum(ShopUserFlowBizEnum.FREE_IN)
+                                .setRelationId(orderInfo.getId())
+                                .setMoney(BigDecimal.valueOf(notifyRespDTO.getAmount()).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN));
+                        shopUserService.updateMoney(shopUserMoneyEditDTO);
+                        upOrderInfo(orderInfo, BigDecimal.ZERO, LocalDateTime.now(), null, PayEnums.FREE_PAY);
+                    }
+                }
+            } else if (PayTypeConstants.SourceType.MEMBER_IN.equals(payment.getSourceType())) {
                ShopUser shopUser = shopUserService.getById(payment.getSourceId());
-                OrderInfo orderInfo;
                if (shopUser == null) {
                    log.error("会员充值失败，会员不存在，会员id：{}", payment.getSourceId());
                } else {
@@ -1081,42 +1098,22 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
                    } else {
                        bizEnum = ShopUserFlowBizEnum.CASH_IN;
                    }
-                    if (isFree) {
-                        orderInfo = orderInfoService.getOne(new QueryWrapper().eq(OrderInfo::getId, payment.getRelatedId()));
-                        if (orderInfo == null) {
-                            log.error("霸王餐支付，订单不存在，支付记录Id,{}", payment.getId());
-                        } else {
-                            //增加余额
-                            ShopUserMoneyEditDTO shopUserMoneyEditDTO = new ShopUserMoneyEditDTO()
-                                    .setId(shopUser.getId())
-                                    .setType(1)
-                                    .setBizEnum(ShopUserFlowBizEnum.FREE_IN)
-                                    .setRelationId(orderInfo.getId())
-                                    .setMoney(BigDecimal.valueOf(notifyRespDTO.getAmount()).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN));
-                            shopUserService.updateMoney(shopUserMoneyEditDTO);
-                            upOrderInfo(orderInfo, BigDecimal.ZERO,
-                                    LocalDateTime.now(), null, PayEnums.FREE_PAY);
-                        }
-                    } else {
-                        //充值并支付 ↓
-                        orderInfo = orderInfoService.getOne(new QueryWrapper()
-                                .eq(OrderInfo::getPayOrderId, payment.getId())
-                                .eq(OrderInfo::getPayType, PayEnums.VIP_PAY.getValue()));
-                        if (orderInfo != null) {
-                            ShopUserMoneyEditDTO shopUserMoneyEditDTO = new ShopUserMoneyEditDTO()
-                                    .setId(shopUser.getId())
-                                    .setType(0)
-                                    .setBizEnum(ShopUserFlowBizEnum.ORDER_PAY)
-                                    .setRelationId(orderInfo.getId())
-                                    .setMoney(orderInfo.getOrderAmount());
-                            shopUserService.updateMoney(shopUserMoneyEditDTO);
-                            upOrderInfo(orderInfo, orderInfo.getOrderAmount(),
-                                    LocalDateTime.now(), null, PayEnums.VIP_PAY);
-                        }
-                        shopRechargeService.recharge(payment.getShopId(), payment.getSourceId(), payment.getRelatedId(),
-                                BigDecimal.valueOf(notifyRespDTO.getAmount()).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN),
-                                payment.getId(), payment.getSourceType(), bizEnum, orderInfo == null);
+                    //充值并支付 ↓
+                    OrderInfo orderInfo = orderInfoService.getOne(new QueryWrapper()
+                            .eq(OrderInfo::getPayOrderId, payment.getId())
+                            .eq(OrderInfo::getPayType, PayEnums.VIP_PAY.getValue()));
+                    if (orderInfo != null) {
+                        ShopUserMoneyEditDTO shopUserMoneyEditDTO = new ShopUserMoneyEditDTO()
+                                .setId(shopUser.getId()).setType(0)
+                                .setBizEnum(ShopUserFlowBizEnum.ORDER_PAY)
+                                .setRelationId(orderInfo.getId())
+                                .setMoney(orderInfo.getOrderAmount());
+                        shopUserService.updateMoney(shopUserMoneyEditDTO);
+                        upOrderInfo(orderInfo, orderInfo.getOrderAmount(), LocalDateTime.now(), null, PayEnums.VIP_PAY);
                    }
+                    shopRechargeService.recharge(payment.getShopId(), payment.getSourceId(), payment.getRelatedId(),
+                            BigDecimal.valueOf(notifyRespDTO.getAmount()).divide(BigDecimal.valueOf(100), 2, RoundingMode.DOWN),
+                            payment.getId(), payment.getSourceType(), bizEnum, orderInfo == null);
                }
            } else if (PayTypeConstants.SourceType.MEMBER_PAY.equals(payment.getSourceType())) {
                //购买会员
@@ -1182,6 +1179,10 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
    @Override
    @Transactional
    public void upOrderInfo(OrderInfo orderInfo, BigDecimal payAmount, LocalDateTime payTime, Long payOrderId, PayEnums payType) {
+        if (orderInfo.getStatus().equals(OrderStatusEnums.DONE.getCode())) {
+            log.info("订单{}已完成，不再更新", orderInfo.getId());
+            return;
+        }
        OrderInfo upOrderInfo = new OrderInfo()
                .setId(orderInfo.getId())
                .setPayAmount(payAmount)
@@ -1223,16 +1224,20 @@ public class OrderInfoCustomServiceImpl implements OrderInfoCustomService {
                    if (StrUtil.isNotBlank(orderInfo.getTableCode())) {
                        ThreadUtil.execAsync(() -> exTable(orderInfo));
                    }
-                    // 事务成功提交后执行消息发送
-                    String printParam = orderId + "_" + (!"after-pay".equals(payMode) ? 1 : 0) + "_1";
-                    rabbitPublisher.sendOrderPrintMsg(printParam, isPrint);
+                    if (payType != PayEnums.BACK_SCAN) {
+                        // 事务成功提交后执行消息发送
+                        String printParam = orderId + "_" + (!"after-pay".equals(payMode) ? 1 : 0) + "_1";
+                        rabbitPublisher.sendOrderPrintMsg(printParam, isPrint, "事务环境打印");
+                    }
 //                    log.info("订单{}事务提交后，发送打印消息", orderId);
                }
            });
        } else {
-            // 非事务环境下直接发送（兼容无事务场景）
-            String printParam = orderId + "_" + (!"after-pay".equals(payMode) ? 1 : 0) + "_1";
-            rabbitPublisher.sendOrderPrintMsg(printParam, isPrint);
+            if (payType != PayEnums.BACK_SCAN) {
+                // 非事务环境下直接发送（兼容无事务场景）
+                String printParam = orderId + "_" + (!"after-pay".equals(payMode) ? 1 : 0) + "_1";
+                rabbitPublisher.sendOrderPrintMsg(printParam, isPrint, "非事务环境打印");
+            }
 //            log.info("非事务环境下，直接发送订单{}打印消息", orderId);
        }
        rabbitPublisher.sendOrderDetailStatusMsg(orderInfo.getShopId().toString(), "bc");
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java
@@ -2,11 +2,13 @@ package com.czg.service.order.service.impl;

 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SecureUtil;
 import cn.hutool.crypto.digest.MD5;
 import com.alibaba.fastjson2.JSONObject;
+import com.czg.PayCst;
 import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO;
 import com.czg.account.entity.ShopInfo;
 import com.czg.account.entity.ShopUser;
@@ -113,7 +115,8 @@ public class OrderPayServiceImpl implements OrderPayService {
            //发送打票信息
            //orderId_0_0  订单ID_先付后付(1先付0后付)_订单状态 0未完成 1完成
            //orderInfo.getId() + "_" + (!"after-pay".equals(orderInfo.getPayMode()) ? 1 : 0) + "_0"
-            rabbitPublisher.sendOrderPrintMsg(orderInfo.getId() + "_" + (!"after-pay".equals(orderInfo.getPayMode()) ? 1 : 0) + "_1", orderInfo.getIsPrint() == 1);
+            rabbitPublisher.sendOrderPrintMsg(orderInfo.getId() + "_" + (!"after-pay".equals(orderInfo.getPayMode()) ? 1 : 0) + "_1",
+                    orderInfo.getIsPrint() == 1, "0元付款");
            redisService.del(RedisCst.classKeyExpired.EXPIRED_ORDER + orderInfo.getId());
            throw new PaySuccessException("支付成功");
        }
@@ -240,7 +243,7 @@ public class OrderPayServiceImpl implements OrderPayService {
                CzgPayBaseReq.ltPayReq(
                        payOrderNo, "充值并支付",
                        rechargeDetail.getAmount().multiply(PayService.MONEY_RATE).longValue(), payParam.getPayType(),
-                        "wechatPay".equals(payParam.getPayType()) ? userInfo.getWechatOpenId() : userInfo.getAlipayOpenId(), clintIp));
+                        PayCst.Type.WECHAT.equals(payParam.getPayType()) ? userInfo.getWechatOpenId() : userInfo.getAlipayOpenId(), clintIp));
    }

    @Override
@@ -263,7 +266,7 @@ public class OrderPayServiceImpl implements OrderPayService {
        AssertUtil.isBlank(payParam.getOpenId(), "用户小程序ID不能为空");
        String payOrderNo = orderInfo.getPlatformType() + CzgRandomUtils.snowflake();
        Long paymentId = payService.initPayment(OrderPayment.orderPay(payParam.getShopId(), orderInfo.getId(), payOrderNo, orderInfo.getOrderAmount(), ""));
-        upOrderPayInfo(orderInfo.getId(), "aliPay".equals(payParam.getPayType()) ? PayEnums.ALIPAY_MINI : PayEnums.WECHAT_MINI, paymentId,
+        upOrderPayInfo(orderInfo.getId(), PayCst.Type.ALIPAY.equals(payParam.getPayType()) ? PayEnums.ALIPAY_MINI : PayEnums.WECHAT_MINI, paymentId,
                payParam.getCheckOrderPay() == null ? null : payParam.getCheckOrderPay().getRemark());
        return payService.pay(payParam.getShopId(), CzgPayEnum.JS_PAY,
                CzgPayBaseReq.jsPayReq(payOrderNo, "点餐支付", orderInfo.getOrderAmount().multiply(PayService.MONEY_RATE).longValue(),
@@ -287,7 +290,7 @@ public class OrderPayServiceImpl implements OrderPayService {
        }
        String payOrderNo = orderInfo.getPlatformType() + CzgRandomUtils.snowflake();
        Long paymentId = payService.initPayment(OrderPayment.orderPay(payParam.getShopId(), orderInfo.getId(), payOrderNo, orderInfo.getOrderAmount(), ""));
-        upOrderPayInfo(orderInfo.getId(), "aliPay".equals(payParam.getPayType()) ? PayEnums.ALIPAY_MINI : PayEnums.WECHAT_MINI, paymentId,
+        upOrderPayInfo(orderInfo.getId(), PayCst.Type.ALIPAY.equals(payParam.getPayType()) ? PayEnums.ALIPAY_MINI : PayEnums.WECHAT_MINI, paymentId,
                payParam.getCheckOrderPay() == null ? null : payParam.getCheckOrderPay().getRemark());
        return payService.pay(payParam.getShopId(), CzgPayEnum.JS_PAY,
                CzgPayBaseReq.jsPayReq(payOrderNo, "扫码支付", orderInfo.getOrderAmount().multiply(PayService.MONEY_RATE).longValue(),
@@ -302,7 +305,7 @@ public class OrderPayServiceImpl implements OrderPayService {
        AssertUtil.isBlank(payParam.getOpenId(), "用户小程序ID不能为空");
        String payOrderNo = orderInfo.getPlatformType() + CzgRandomUtils.snowflake();
        Long paymentId = payService.initPayment(OrderPayment.orderPay(payParam.getShopId(), orderInfo.getId(), payOrderNo, orderInfo.getOrderAmount(), ""));
-        upOrderPayInfo(orderInfo.getId(), "aliPay".equals(payParam.getPayType()) ? PayEnums.ALIPAY_MINI : PayEnums.WECHAT_MINI, paymentId,
+        upOrderPayInfo(orderInfo.getId(), PayCst.Type.ALIPAY.equals(payParam.getPayType()) ? PayEnums.ALIPAY_MINI : PayEnums.WECHAT_MINI, paymentId,
                payParam.getCheckOrderPay() == null ? null : payParam.getCheckOrderPay().getRemark());
        return payService.pay(payParam.getShopId(), CzgPayEnum.LT_PAY,
                CzgPayBaseReq.ltPayReq(payOrderNo, "点餐支付", orderInfo.getOrderAmount().multiply(PayService.MONEY_RATE).longValue(),
@@ -354,6 +357,9 @@ public class OrderPayServiceImpl implements OrderPayService {
        if (mapCzgResult.getCode() == 200) {
            orderInfoCustomService.upOrderInfo(orderInfo, orderInfo.getOrderAmount(),
                    LocalDateTime.now(), paymentId, PayEnums.BACK_SCAN);
+            // 事务成功提交后执行消息发送
+            String printParam = orderInfo.getId() + "_" + (!"after-pay".equals( orderInfo.getPayMode()) ? 1 : 0) + "_1";
+            rabbitPublisher.sendOrderPrintMsg(printParam, orderInfo.getIsPrint() == 1, "事务环境打印");
        } else {
            upOrderPayInfo(orderInfo.getId(), PayEnums.BACK_SCAN, paymentId,
                    payParam.getCheckOrderPay() == null ? null : payParam.getCheckOrderPay().getRemark());
@@ -522,12 +528,11 @@ public class OrderPayServiceImpl implements OrderPayService {
            }
            throw new CzgException(refund.getMsg());
        } else {
-            paymentService.updateChain()
-                    .eq(OrderPayment::getId, refundId)
-                    .set(OrderPayment::getPayTime, refund.getData().getRefundTime())
-                    .set(OrderPayment::getTradeNumber, refund.getData().getThirdRefundNo())
-                    .set(OrderPayment::getRespJson, refund.getData().getOriginalData())
-                    .update();
+            OrderPayment upPayment = new OrderPayment();
+            upPayment.setPayTime(LocalDateTimeUtil.parse(refund.getData().getRefundTime()));
+            upPayment.setTradeNumber(refund.getData().getThirdRefundNo());
+            upPayment.setRespJson(refund.getData().getOriginalData());
+            paymentService.update(upPayment, new QueryWrapper().eq(OrderPayment::getId, refundId));
        }
    }

--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
@@ -6,10 +6,10 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSONObject;
 import com.czg.PayAdapter;
 import com.czg.PayAdapterFactory;
+import com.czg.PayCst;
 import com.czg.constant.PayChannelCst;
 import com.czg.constants.ParamCodeCst;
 import com.czg.constants.PayTypeConstants;
-import com.czg.constants.SystemConstants;
 import com.czg.enums.CzgPayEnum;
 import com.czg.exception.CzgException;
 import com.czg.order.dto.LtPayOtherDTO;
@@ -64,10 +64,13 @@ public class PayServiceImpl implements PayService {
        } else if (shopMerchant.getChannel().equals(PayChannelCst.POLY)) {
            payData = shopMerchant.getPolyPayJson();
        }
-        bizData.setSubAppid(SystemConstants.PayType.ALIPAY.equals(bizData.getPayType()) ? shopMerchant.getAlipayAppId() : shopMerchant.getWechatAppId());
        if (payType.equals(CzgPayEnum.MICRO_PAY)) {
            checkMicroPay(bizData, shopMerchant);
        }
+        if (!PayCst.Type.WECHAT.equals(bizData.getPayType()) && !PayCst.Type.ALIPAY.equals(bizData.getPayType())) {
+            throw new CzgException("支付方式错误");
+        }
+        bizData.setSubAppid(PayCst.Type.ALIPAY.equals(bizData.getPayType()) ? shopMerchant.getAlipayAppId() : shopMerchant.getWechatAppId());
        return adapter.pay(payType, payData, getDomain(), getNotifyUrl(shopMerchant.getChannel()), bizData);
    }

@@ -78,7 +81,7 @@ public class PayServiceImpl implements PayService {
        AssertUtil.isBlank(param.getPayType(), "支付方式不能为空");
        String payOrderNo = "LT" + IdUtil.getSnowflakeNextId();
        initPayment(OrderPayment.pay(param.getShopId(), param.getRecordId(), payType, payOrderNo,
-                param.getPrice(), "", null));
+                param.getPrice(), "", param.getRelatedId()));
        return pay(param.getShopId(), CzgPayEnum.LT_PAY,
                CzgPayBaseReq.ltPayReq(payOrderNo, detail, param.getPrice().multiply(MONEY_RATE).longValue(),
                        param.getPayType(), param.getOpenId(), param.getIp()));
@@ -229,11 +232,11 @@ public class PayServiceImpl implements PayService {
        if (firstTwoDigits >= 10 && firstTwoDigits <= 15) {
            //微信支付
            bizData.setSubAppid(shopMerchant.getWechatAppId());
-            bizData.setPayType(SystemConstants.PayType.WECHAT);
+            bizData.setPayType(PayCst.Type.WECHAT);
        } else if (firstTwoDigits >= 25 && firstTwoDigits <= 30) {
            //支付宝支付
            bizData.setSubAppid(shopMerchant.getAlipayAppId());
-            bizData.setPayType(SystemConstants.PayType.ALIPAY);
+            bizData.setPayType(PayCst.Type.ALIPAY);
        } else {
            throw new CzgException("扫描码非法或暂不支持");
        }
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopMerchantServiceImpl.java
@@ -75,8 +75,8 @@ public class ShopMerchantServiceImpl extends ServiceImpl<ShopMerchantMapper, Sho
        ShopMerchant shopMerchant = getOne(query().eq(ShopMerchant::getShopId, shopMerchantParam.getShopId()));
        if (shopMerchant == null) {
            shopMerchant = new ShopMerchant();
-            shopMerchant.setAlipayAppId(SystemConstants.PayType.ALIPAY_APP_ID);
-            shopMerchant.setWechatAppId(SystemConstants.PayType.WECHAT_APP_ID);
+            shopMerchant.setAlipayAppId(SystemConstants.PayAppId.ALIPAY_APP_ID);
+            shopMerchant.setWechatAppId(SystemConstants.PayAppId.WECHAT_APP_ID);
            shopMerchant.setRelatedId(shopMerchantParam.getShopId());
        }
        shopMerchant.setShopId(shopMerchantParam.getShopId());
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopUserServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/ShopUserServiceImpl.java
@@ -2,6 +2,7 @@ package com.czg.service.order.service.impl;

 import cn.hutool.core.util.IdUtil;
 import cn.hutool.crypto.SecureUtil;
+import com.czg.PayCst;
 import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO;
 import com.czg.account.entity.*;
 import com.czg.account.service.*;
@@ -158,6 +159,7 @@ public class ShopUserServiceImpl implements ShopUserPayService {
                .setRecordId(shopUser.getId())
                .setPrice(memberOrder.getAmount())
                .setIp(clientIp);
+        payParam1.setRelatedId(memberOrder.getId());
        return payService.ltPayOther(payParam1, PayTypeConstants.SourceType.MEMBER_PAY, "会员充值");
    }

@@ -189,6 +191,7 @@ public class ShopUserServiceImpl implements ShopUserPayService {
                .setRecordId(shopUser.getId())
                .setPrice(payParam.getAmount())
                .setIp(clintIp);
+        payParam1.setRelatedId(isFree ? payParam.getOrderId() : payParam.getRechargeDetailId());
        return payService.ltPayOther(payParam1, payType, "会员充值");
    }

@@ -209,12 +212,13 @@ public class ShopUserServiceImpl implements ShopUserPayService {
        String payType = isFree ? PayTypeConstants.SourceType.FREE : PayTypeConstants.SourceType.MEMBER_IN;

        LtPayOtherDTO payParam = new LtPayOtherDTO()
-                .setOpenId("wechatPay".equals(rechargeDTO.getPayType()) ? userInfo.getWechatOpenId() : userInfo.getAlipayOpenId())
+                .setOpenId(PayCst.Type.WECHAT.equals(rechargeDTO.getPayType()) ? userInfo.getWechatOpenId() : userInfo.getAlipayOpenId())
                .setPayType(rechargeDTO.getPayType())
                .setShopId(rechargeDTO.getShopId())
                .setRecordId(shopUser.getId())
                .setPrice(amount)
                .setIp(clientIp);
+        payParam.setRelatedId(isFree ? rechargeDTO.getOrderId() : rechargeDTO.getRechargeDetailId());
        return payService.ltPayOther(payParam, payType, "会员充值");
    }

--- a/cash-service/pay-service/src/main/java/com/czg/impl/PolyPayAdapter.java
+++ b/cash-service/pay-service/src/main/java/com/czg/impl/PolyPayAdapter.java
@@ -2,9 +2,9 @@ package com.czg.impl;

 import com.alibaba.fastjson2.JSONObject;
 import com.czg.PayAdapter;
+import com.czg.PayCst;
 import com.czg.PolyPayUtils;
 import com.czg.constant.PayChannelCst;
-import com.czg.constants.SystemConstants;
 import com.czg.entity.resp.CzgBaseResp;
 import com.czg.entity.resp.CzgRefundResp;
 import com.czg.enums.CzgPayEnum;
@@ -84,15 +84,15 @@ public class PolyPayAdapter implements PayAdapter {
    }

    private CzgResult<Map<String, Object>> jsPay(PolyMerchantDTO shopMerchant, String domain, String notifyUrl, CzgPayBaseReq bizData) {
-        AssertUtil.isBlank(bizData.getSubAppid(), "暂不可用，请联系商家配置" + (SystemConstants.PayType.ALIPAY.equals(bizData.getPayType()) ? "支付宝" : "微信") + "小程序");
-        bizData.setPayType(SystemConstants.PayType.ALIPAY.equals(bizData.getPayType()) ? "ALIPAY" : "WECHAT");
+        AssertUtil.isBlank(bizData.getSubAppid(), "暂不可用，请联系商家配置" + (PayCst.Type.ALIPAY.equals(bizData.getPayType()) ? "支付宝" : "微信") + "小程序");
+        bizData.setPayType(PayCst.Type.ALIPAY.equals(bizData.getPayType()) ? "ALIPAY" : "WECHAT");
        bizData.polyBase(shopMerchant.getStoreId(), notifyUrl);
        return PolyPayUtils.jsPay(domain, shopMerchant.getAppId(), shopMerchant.getAppSecret(), bizData);

    }

    private CzgResult<Map<String, Object>> ltPay(PolyMerchantDTO shopMerchant, String domain, String notifyUrl, CzgPayBaseReq bizData) {
-        AssertUtil.isBlank(bizData.getSubAppid(), "暂不可用，请联系商家配置" + ("aliPay".equals(bizData.getPayType()) ? "支付宝" : "微信") + "小程序");
+        AssertUtil.isBlank(bizData.getSubAppid(), "暂不可用，请联系商家配置" + (PayCst.Type.ALIPAY.equals(bizData.getPayType()) ? "支付宝" : "微信") + "小程序");
        bizData.polyBase(shopMerchant.getStoreId(), notifyUrl);
        return PolyPayUtils.ltPay(domain, shopMerchant.getAppId(), shopMerchant.getAppSecret(), bizData);
    }
--- a/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml
+++ b/cash-service/product-service/src/main/resources/mapper/ProductMapper.xml
@@ -149,7 +149,7 @@
            and t1.shop_id = #{shopId}
        </where>
        <if test="idList != null">
-            and t1.id in
+            and (t1.id in
            <foreach item="item" collection="idList" separator="," open="(" close=")">
                #{item}
            </foreach>
@@ -157,6 +157,7 @@
            <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	bae925695a	查询关联商品 sync_id bug	2026-01-22 15:57:30 +08:00
wangw	a94a9197b8	优惠券详情	2026-01-21 16:10:26 +08:00
wangw	3a1579d281	优惠券详情	2026-01-21 16:06:20 +08:00
wangw	f092fdc0e9	必填	2026-01-21 15:51:30 +08:00
wangw	bb673d805a	积分商品详情	2026-01-21 15:33:30 +08:00
wangw	0ba52b85b2	检查登录	2026-01-21 13:36:59 +08:00
wangw	0345ab85ec	标识	2026-01-21 10:39:02 +08:00
wangw	6f64c8be81	莫名其妙的问题	2026-01-21 10:37:37 +08:00
wangw	1ce9b023ab	token问题	2026-01-21 10:33:11 +08:00
wangw	a1aebd16de	token问题	2026-01-21 10:26:01 +08:00
wangw	0549a077b2	会员充值/霸王餐支付关联id问题统一异常拦截 rootCause 值 CLIENT_LOGIC 与 USER_LOGIC 问题	2026-01-21 10:17:09 +08:00
wangw	45965fb426	异常信息尝试获取	2026-01-20 18:25:02 +08:00
wangw	034a8c4650	报错	2026-01-20 17:51:39 +08:00
wangw	4cd71ad35a	兼容	2026-01-20 17:43:36 +08:00
wangw	64830203f3	详细日志	2026-01-20 17:39:39 +08:00
wangw	c542f18938	获取邀请码失败的问题日志	2026-01-20 15:44:08 +08:00
wangw	cc40a8a7f0	不报错获取邀请码	2026-01-20 15:13:22 +08:00
wangw	f10bafce52	Merge branch 'prod' into test	2026-01-20 14:49:54 +08:00
wangw	3e42b534e0	台桌排序分享绑定	2026-01-20 10:19:33 +08:00
wangw	a367a286ce	v3报错	2026-01-19 11:09:07 +08:00
wangw	37651e0e02	支付方式问题	2026-01-17 17:52:24 +08:00
wangw	9bcbad42ad	支付方式问题	2026-01-17 17:43:03 +08:00
wangw	8242a4f905	支付类型	2026-01-17 17:32:31 +08:00
wangw	cf3c58169d	BACK_SCAN支付主扫直接成功的没有异步通知	2026-01-17 15:49:08 +08:00
wangw	f1e9d0f4cf	bacn scan 打印两次问题	2026-01-17 15:25:05 +08:00
wangw	de21e0a202	bacn scan 打印两次问题	2026-01-17 15:01:32 +08:00
wangw	fff14043b5	触发打印位置	2026-01-17 14:36:04 +08:00
wangw	5da3b447c7	退款更新问题	2026-01-17 14:18:27 +08:00