diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/order/ShopOrderData.java b/mall-common/src/main/java/com/suisung/mall/common/modules/order/ShopOrderData.java
index 152a1839..ff480e84 100644
--- a/mall-common/src/main/java/com/suisung/mall/common/modules/order/ShopOrderData.java
+++ b/mall-common/src/main/java/com/suisung/mall/common/modules/order/ShopOrderData.java
@@ -101,6 +101,9 @@ public class ShopOrderData implements Serializable {
     @ApiModelProperty(value = "平台费（分给平台或代理商的费用），根据不同的店铺分类，从商品原价中扣除相应的费用。")
     private BigDecimal platform_fee;
 
+    @ApiModelProperty(value = "拉卡拉手续费")
+    private BigDecimal lkl_fee;
+
     @ApiModelProperty(value = "店铺统一设置的打包费")
     private BigDecimal packing_fee;
 
diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/order/dto/MchOrderInfoDTO.java b/mall-common/src/main/java/com/suisung/mall/common/modules/order/dto/MchOrderInfoDTO.java
index 002a4a4b..23378173 100644
--- a/mall-common/src/main/java/com/suisung/mall/common/modules/order/dto/MchOrderInfoDTO.java
+++ b/mall-common/src/main/java/com/suisung/mall/common/modules/order/dto/MchOrderInfoDTO.java
@@ -74,6 +74,8 @@ public class MchOrderInfoDTO implements Serializable {
     private BigDecimal order_shipping_fee;
     @ApiModelProperty(value = "平台内部配送费")
     private BigDecimal order_shipping_fee_inner;
+    @ApiModelProperty(value = "拉卡拉手续费")
+    private BigDecimal lkl_fee;
     @ApiModelProperty(value = "平台费")
     private BigDecimal platform_fee;
     @ApiModelProperty(value = "店铺统一设置的打包费")
diff --git a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/LakalaPayServiceImpl.java b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/LakalaPayServiceImpl.java
index 5044240d..14cace25 100644
--- a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/LakalaPayServiceImpl.java
+++ b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/LakalaPayServiceImpl.java
@@ -558,25 +558,27 @@ public class LakalaPayServiceImpl implements LakalaPayService {
                 log.warn("[拉卡拉退款] 退款金额不合法: refundAmount={}", refundAmount);
                 return Pair.of(false, I18nUtil._("退款金额不合法！"));
             }
+            
+            if (StrUtil.hasBlank(lklMerchantNo, lklTermNo)) {
+                // 4. 获取店铺的拉卡拉商户号和终端号
+                ShopStoreBase shopStoreBase = shopService.getLklMerchantNoAndTermNo(storeId);
+                if (shopStoreBase == null) {
+                    log.error("[拉卡拉退款] 无法获取店铺信息: storeId={}", storeId);
+                    return Pair.of(false, I18nUtil._("无法获取店铺信息，退款失败！"));
+                }
 
-            // 3. 初始化拉卡拉SDK
-            initLKLSDK();
+                if (StrUtil.isBlank(shopStoreBase.getLkl_merchant_no()) || StrUtil.isBlank(shopStoreBase.getLkl_term_no())) {
+                    log.error("[拉卡拉退款] 无法获取店铺的拉卡拉商户号或终端号: storeId={}, merchantNo={}, termNo={}",
+                            storeId, shopStoreBase.getLkl_merchant_no(), shopStoreBase.getLkl_term_no());
+                    return Pair.of(false, I18nUtil._("缺少商户号参数，退款失败！"));
+                }
 
-            // 4. 获取店铺的拉卡拉商户号和终端号
-            ShopStoreBase shopStoreBase = shopService.getLklMerchantNoAndTermNo(storeId);
-            if (shopStoreBase == null) {
-                log.error("[拉卡拉退款] 无法获取店铺信息: storeId={}", storeId);
-                return Pair.of(false, I18nUtil._("无法获取店铺信息，退款失败！"));
-            }
-
-            if (StrUtil.isBlank(shopStoreBase.getLkl_merchant_no()) || StrUtil.isBlank(shopStoreBase.getLkl_term_no())) {
-                log.error("[拉卡拉退款] 无法获取店铺的拉卡拉商户号或终端号: storeId={}, merchantNo={}, termNo={}",
-                        storeId, shopStoreBase.getLkl_merchant_no(), shopStoreBase.getLkl_term_no());
-                return Pair.of(false, I18nUtil._("缺少商户号参数，退款失败！"));
+                // 如果商户号和终端号是空的，
+                lklMerchantNo = StrUtil.isBlank(lklMerchantNo) ? shopStoreBase.getLkl_merchant_no() : lklMerchantNo;
+                lklTermNo = StrUtil.isBlank(lklTermNo) ? shopStoreBase.getLkl_term_no() : lklTermNo;
             }
 
             // TODO 重要的逻辑，获取是否已经分账？已分账：分账退回；查商家账户余额够不够退回？够就执行退回
-
             if (StrUtil.isBlank(refundReason)) {
                 refundReason = "商家与买方协商退款";
             }
@@ -585,17 +587,16 @@ public class LakalaPayServiceImpl implements LakalaPayService {
             V3LabsRelationRefundRequest refundRequest = new V3LabsRelationRefundRequest();
             refundRequest.setOutTradeNo(outTradeNo);
             refundRequest.setOriginTradeNo(originTradeNo);
-            lklMerchantNo = StrUtil.isBlank(lklMerchantNo) ? shopStoreBase.getLkl_merchant_no() : lklMerchantNo;
-            lklTermNo = StrUtil.isBlank(lklTermNo) ? shopStoreBase.getLkl_term_no() : lklTermNo;
             refundRequest.setMerchantNo(lklMerchantNo);
             refundRequest.setTermNo(lklTermNo);
             refundRequest.setRefundAmount(refundAmount);
             refundRequest.setRefundReason(refundReason);
-
             refundRequest.setLocationInfo(new V3LabsTradeLocationInfo(requestIp, null, ""));
 
             log.info("[拉卡拉退款] 请求参数: {}", JSONUtil.toJsonStr(refundRequest));
 
+            // 3. 初始化拉卡拉SDK
+            initLKLSDK();
             String responseString = LKLSDK.httpPost(refundRequest);
             // 6. 处理响应
             if (StrUtil.isBlank(responseString)) {
diff --git a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeTradeServiceImpl.java b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeTradeServiceImpl.java
index a8678096..3cc53738 100644
--- a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeTradeServiceImpl.java
+++ b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayConsumeTradeServiceImpl.java
@@ -188,7 +188,7 @@ public class PayConsumeTradeServiceImpl extends BaseServiceImpl<PayConsumeTradeM
      * @param points        积分支付,此处为积分转换的支付额度。
      * @param credit        信用支付
      * @param redpack       红包支付
-     *                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     todo 没有增量更新数据
+     *                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   todo 没有增量更新数据
      */
     // todo 优化逻辑
     @Override
@@ -1370,15 +1370,19 @@ public class PayConsumeTradeServiceImpl extends BaseServiceImpl<PayConsumeTradeM
                             if (Arrays.asList("alipay", "wx_native", "lakala").contains(paymentChannelCode)) {
                                 // 获取在线支付交易号
                                 String depositTradeNo = consumeRow.getDeposit_trade_no();
+
+                                // 商品子单对账流水号和运费子单对账流水号
                                 String ordSubTradeNo = consumeRow.getOrd_sub_trade_no();
                                 String dfSubTradeNo = consumeRow.getDf_sub_trade_no();
+
                                 String lklMerchantNo = "";
                                 String lklTermNo = "";
                                 log.info("在线支付交易号: {}, 商品子单对账流水号: {}, 运费子单对账流水号: {}", depositTradeNo, ordSubTradeNo, dfSubTradeNo);
 
                                 String outTradeNo = depositTradeNo;
-                                // 有运费的合单订单
-                                if (StrUtil.isAllNotBlank(ordSubTradeNo, dfSubTradeNo)) {
+                                // 合单情况：有运费的合单订单
+                                if (!StrUtil.hasBlank(ordSubTradeNo, dfSubTradeNo)) {
+                                    //确定订单是运费订单
                                     if (CommonConstant.Enable.equals(returnRow.getReturn_is_shipping_fee())) {
                                         // 退运费
                                         outTradeNo = dfSubTradeNo;
@@ -1421,14 +1425,15 @@ public class PayConsumeTradeServiceImpl extends BaseServiceImpl<PayConsumeTradeM
                                         // 如果原路退款失败，直接退回余额
 
                                         // 获取买家用户资源
-                                        PayUserResource payUserResource = payUserResourceService.getById(buyerUserId);
-                                        // 设置买家用户余额（原余额 + 余额差额）
-                                        payUserResource.setUser_money(NumberUtil.add(payUserResource.getUser_money(), moneyDifference));
-                                        // 修改买家用户资源
-                                        if (!payUserResourceService.edit(payUserResource)) {
-                                            throw new ApiException(I18nUtil._("用户退款失败！"));
-                                        }
-                                        //throw new ApiException(I18nUtil._("退款原路返回失败！"));
+//                                        PayUserResource payUserResource = payUserResourceService.getById(buyerUserId);
+//                                        // 设置买家用户余额（原余额 + 余额差额）
+//                                        payUserResource.setUser_money(NumberUtil.add(payUserResource.getUser_money(), moneyDifference));
+//                                        // 修改买家用户资源
+//                                        if (!payUserResourceService.edit(payUserResource)) {
+//                                            throw new ApiException(I18nUtil._("用户退款失败！"));
+//                                        }
+
+                                        throw new ApiException(I18nUtil._("退款原路返回失败！"));
                                     }
                                 }
 
diff --git a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java
index 4077e7b5..c45bc05d 100644
--- a/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java
+++ b/mall-pay/src/main/java/com/suisung/mall/pay/service/impl/PayUserPayServiceImpl.java
@@ -291,8 +291,8 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
 //                }
 
                 if (StrUtil.isBlank(trade_row.getTrade_title())) {
-                    trade_row.setTrade_title("小发同城线上订单商品");
-                    trade_row.setTrade_desc("小发同城线上订单商品");
+                    trade_row.setTrade_title("小发同城-线上商品");
+                    trade_row.setTrade_desc("小发同城-线上购买的商品");
                 }
 
                 // 设置店铺ID
@@ -671,10 +671,7 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
         String requestIP = IpKit.getRealIp(request);
         String notifyUrl = domain + "/lkl_wxPay_notify_url";
         String storeIdStr = Convert.toStr(storeId);// 店铺Id
-
-        // TODO 判断订单有没有运费，有运费请求合单交易，没有运费，请求聚合主扫交易
-        cn.hutool.json.JSONObject lakalaRespJSON = new cn.hutool.json.JSONObject();
-
+        
         BigDecimal shippingFee = shopService.getOrderShippingFee(out_trade_no);
         if (shippingFee == null || shippingFee.intValue() <= 0) {
             shippingFee = BigDecimal.ZERO;
@@ -686,24 +683,25 @@ public class PayUserPayServiceImpl extends BaseServiceImpl<PayUserPayMapper, Pay
         logger.debug("预支付时，查到的订单{},商家配送费：{}元，平台最低配送费要求：{}分", out_trade_no, shippingFee, innerMinDeliverFee);
 
         // 平台最低配送费，单位（分）
-        if (innerMinDeliverFee == null || innerMinDeliverFee.intValue() <= 0) {
-            // 没有运费
-            // 拉卡拉预支付返回参数
-            lakalaRespJSON = lakalaPayService.lklTransPreOrder(shopStoreBase.getLkl_merchant_no(), shopStoreBase.getLkl_term_no(),
-                    appId, openId, storeIdStr, out_trade_no, subject, total_amt,
-                    notifyUrl,
-                    requestIP, trade_remark);
-        } else { // 有运费的情况
-            // 拉卡拉合单预支付返回参数
-            // RMK 这里只有固定一个运费代理商代收运费，以后代理商模块做好了，要动态读取店铺的运费代理商。
-            lakalaRespJSON = lakalaPayService.lklTransMergePreOrder(shopStoreBase.getLkl_merchant_no(), shopStoreBase.getLkl_term_no(),
-                    delivery_merchant_no, delivery_term_no, // 以后根据代理商动态分配
-                    appId, openId, storeIdStr, out_trade_no, subject, total_amt,
-                    // Convert.toStr(shippingFee.multiply(BigDecimal.valueOf(100)).intValue()),
-                    Convert.toStr(innerMinDeliverFee),
-                    notifyUrl,
-                    requestIP, trade_remark);
-        }
+//        if (innerMinDeliverFee == null || innerMinDeliverFee.intValue() <= 0) { // 没有运费
+        // 内部运费统一由分账接收方收取了 2025-10-11
+        // 拉卡拉预支付返回参数
+
+        // TODO 判断订单有没有运费，有运费请求合单交易，没有运费，请求聚合主扫交易
+        cn.hutool.json.JSONObject lakalaRespJSON = lakalaPayService.lklTransPreOrder(shopStoreBase.getLkl_merchant_no(), shopStoreBase.getLkl_term_no(),
+                appId, openId, storeIdStr, out_trade_no, subject, total_amt,
+                notifyUrl,
+                requestIP, trade_remark);
+//        } else { // 有运费的情况
+//            // 拉卡拉合单预支付返回参数
+//            // RMK 这里只有固定一个运费代理商代收运费，以后代理商模块做好了，要动态读取店铺的运费代理商。
+//            lakalaRespJSON = lakalaPayService.lklTransMergePreOrder(shopStoreBase.getLkl_merchant_no(), shopStoreBase.getLkl_term_no(),
+//                    delivery_merchant_no, delivery_term_no, // 以后根据代理商动态分配
+//                    appId, openId, storeIdStr, out_trade_no, subject, total_amt,
+//                    Convert.toStr(innerMinDeliverFee),
+//                    notifyUrl,
+//                    requestIP, trade_remark);
+//        }
 
         logger.debug("拉卡拉合单预支付返回参数:{}", lakalaRespJSON);
 
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
index d77a68ae..26ddc3fe 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderBaseServiceImpl.java
@@ -7696,19 +7696,23 @@ public class ShopOrderBaseServiceImpl extends BaseServiceImpl<ShopOrderBaseMappe
                                     .divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
                             BigDecimal platformFee = BigDecimal.valueOf(lklSeparateDTO.getPlatAmount() + lklSeparateDTO.getAgent1stAmount() + lklSeparateDTO.getAgent2ndAmount())
                                     .divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
+                            BigDecimal lklFee = BigDecimal.valueOf(lklSeparateDTO.getLklAmount()).divide(BigDecimal.valueOf(100), 2, RoundingMode.HALF_UP);
 
                             // 防止负值
                             data_row.setTotal_separate_value(totalSeparateAmount.max(BigDecimal.ZERO));
                             data_row.setPlatform_fee(platformFee.max(BigDecimal.ZERO));
+                            data_row.setLkl_fee(lklFee.max(BigDecimal.ZERO));
                         } catch (Exception e) {
                             log.warn("分账金额计算异常，使用默认值: {}", e.getMessage());
                             data_row.setTotal_separate_value(BigDecimal.ZERO);
                             data_row.setPlatform_fee(BigDecimal.ZERO);
+                            data_row.setLkl_fee(BigDecimal.ZERO);
                         }
                     } else {
                         log.warn("拉卡拉分账参数计算失败，使用默认值");
                         data_row.setTotal_separate_value(BigDecimal.ZERO);
                         data_row.setPlatform_fee(BigDecimal.ZERO);
+                        data_row.setLkl_fee(BigDecimal.ZERO);
                     }
 
                     Integer voucher_id = (Integer) order_voucher_row.get("voucher_id");
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
index ef26333c..7ecccde9 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/order/service/impl/ShopOrderReturnServiceImpl.java
@@ -1619,10 +1619,15 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
                                 logger.debug("最后一个商品，已添加打包费到退款金额，订单ID: {}", order_id);
                             }
 
+
                             // 有运费的，重新生成一个运费退单
+//                            if (order_data_row != null &&
+//                                    order_data_row.getOrder_shipping_fee_inner() != null &&
+//                                    order_data_row.getOrder_shipping_fee_inner().compareTo(BigDecimal.ZERO) > 0) {
+                            // 注意：商家配置的配送费
                             if (order_data_row != null &&
-                                    order_data_row.getOrder_shipping_fee_inner() != null &&
-                                    order_data_row.getOrder_shipping_fee_inner().compareTo(BigDecimal.ZERO) > 0) {
+                                    order_data_row.getOrder_shipping_fee() != null &&
+                                    order_data_row.getOrder_shipping_fee().compareTo(BigDecimal.ZERO) > 0) {
                                 // 运费大于0的， 执行退运费操作, 有两种方案，1、生成退运费售后服务单； 2、直接执行退款
                                 // 1、生成独立退运费售后服务单，需注意运费是退给运费代理商的，需要获取代理商的交易单号
 
@@ -1631,13 +1636,16 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
                                 Integer buyer_user_id = info_row.getBuyer_user_id();
                                 Integer storeId = info_row.getStore_id();
 
-                                // 平台内部订单运费
-                                BigDecimal orderShippingFeeInner = order_data_row.getOrder_shipping_fee_inner();
-                                if (orderShippingFeeInner == null || orderShippingFeeInner.compareTo(BigDecimal.ZERO) <= 0) {
-                                    orderShippingFeeInner = shopOrderLklService.getOrderShippingFeeInnerToDecimal(storeId, order_id);
-                                }
+//                                // 平台内部订单配送费
+//                                BigDecimal orderShippingFeeInner = order_data_row.getOrder_shipping_fee_inner();
+//                                if (orderShippingFeeInner == null || orderShippingFeeInner.compareTo(BigDecimal.ZERO) <= 0) {
+//                                    orderShippingFeeInner = shopOrderLklService.getOrderShippingFeeInnerToDecimal(storeId, order_id);
+//                                }
 
-                                return_order_shipping_fee_row.setReturn_refund_amount(orderShippingFeeInner); // 平台内部配送费退款金额
+                                // 商家设置的配送费
+                                BigDecimal orderShippingFee = order_data_row.getOrder_shipping_fee();
+
+                                return_order_shipping_fee_row.setReturn_refund_amount(orderShippingFee); // 平台内部配送费退款金额
 
                                 BigDecimal order_points_fee = ObjectUtil.defaultIfNull(order_data_row.getOrder_points_fee(), BigDecimal.ZERO);
                                 BigDecimal order_refund_agree_points = ObjectUtil.defaultIfNull(order_data_row.getOrder_refund_agree_points(), BigDecimal.ZERO);
@@ -1649,7 +1657,7 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
                                 return_order_shipping_fee_row.setReturn_reason_id(0);
                                 return_order_shipping_fee_row.setReturn_buyer_message(I18nUtil._("订单（配送费）退款"));
                                 return_order_shipping_fee_row.setStore_id(storeId);
-                                return_order_shipping_fee_row.setReturn_refund_point(NumberUtil.min(return_refund_point, orderShippingFeeInner));
+                                return_order_shipping_fee_row.setReturn_refund_point(NumberUtil.min(return_refund_point, orderShippingFee));
                                 return_order_shipping_fee_row.setReturn_add_time(now); // 添加时间
                                 return_order_shipping_fee_row.setReturn_tel("");
 
@@ -1733,12 +1741,12 @@ public class ShopOrderReturnServiceImpl extends BaseServiceImpl<ShopOrderReturnM
             try {
                 if (!payService.doRefund(returnOrder)) {
                     logger.error("执行退款操作失败！退单列表: {}", return_ids);
-                    throw new ApiException(ResultCode.FAILED);
+                    throw new ApiException("暂无法退款，请稍候再重试！");
                 }
             } catch (Exception e) {
                 logger.error("执行退款操作异常！退单列表: {}", return_ids, e);
                 // 根据业务需要决定是抛出异常触发回滚，还是其他处理方式
-                throw new ApiException("退款服务调用异常: " + e.getMessage());
+                throw new ApiException("暂无法退款，请稍候再重试！");
             }
 
             logger.info("退款操作执行成功，退单列表: {}", return_ids);
diff --git a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java b/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java
index 72cbfbbd..492a9e7f 100644
--- a/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java
+++ b/mall-shop/src/main/java/com/suisung/mall/shop/sfexpress/service/impl/SFExpressApiServiceImpl.java
@@ -521,10 +521,10 @@ public class SFExpressApiServiceImpl implements SFExpressApiService {
         shopOrderInfoService.changeOrderStatus(shopOrderId, StateCode.ORDER_STATE_PICKING, 0, 0);
 
         // 个推推送消息
-        JSONObject payload = new JSONObject();
-        payload.put("category", CommonConstant.PUSH_MSG_CATE_MCH_ORDER_DETAIL);
-        payload.put("orderId", shopOrderId);
-        pushMessageService.noticeMerchantEmployeeOrderAction(null, shopOrderId, "您有一笔新的订单", "您有一笔同城订单[" + shopOrderId + "]，请及时处理。", payload);
+//        JSONObject payload = new JSONObject();
+//        payload.put("category", CommonConstant.PUSH_MSG_CATE_MCH_ORDER_DETAIL);
+//        payload.put("orderId", shopOrderId);
+//        pushMessageService.noticeMerchantEmployeeOrderAction(null, shopOrderId, "您有一笔新的订单", "您有一笔同城订单[" + shopOrderId + "]，请及时处理。", payload);
 
         return Pair.of(true, "顺丰同城下单成功！");
     }
@@ -988,6 +988,7 @@ public class SFExpressApiServiceImpl implements SFExpressApiService {
 
             // 上传发货信息到微信
             wxOrderShippingService.uploadShippingInfoToWx(2, shopOrderId);
+
         } else if (shopStoreSfOrder.getOrder_status().equals(StateCode.SF_ORDER_STATUS_ARRIVED)) {
             // 顺丰同城状态：12-配送员到店;
             // 商城订单状态：从 2020-待配货 到 2030; //待发货
@@ -1007,6 +1008,7 @@ public class SFExpressApiServiceImpl implements SFExpressApiService {
             pushRemark = "配送员已取货。";
             // 上传发货信息到微信
             wxOrderShippingService.uploadShippingInfoToWx(2, shopOrderId);
+
         } else if (shopStoreSfOrder.getOrder_status().equals(StateCode.SF_ORDER_STATUS_FINISH)) {
             // 顺丰同城状态：17-配送员妥投完单;
 //            orderStatus = StateCode.ORDER_STATE_FINISH;
@@ -1028,10 +1030,10 @@ public class SFExpressApiServiceImpl implements SFExpressApiService {
         shopOrderInfoService.changeOrderStatus(shopOrderId, orderStatus, orderIsOutStatus, orderIsShippedStatus);
 
         // 消息推送
-        JSONObject payload = new JSONObject();
-        payload.put("category", CommonConstant.PUSH_MSG_CATE_MCH_ORDER_DETAIL);
-        payload.put("orderId", shopOrderId);
-        pushMessageService.noticeMerchantEmployeeOrderAction(null, shopOrderId, "", "顺丰同城订单[" + shopOrderId + "]" + pushRemark, payload);
+//        JSONObject payload = new JSONObject();
+//        payload.put("category", CommonConstant.PUSH_MSG_CATE_MCH_ORDER_DETAIL);
+//        payload.put("orderId", shopOrderId);
+//        pushMessageService.noticeMerchantEmployeeOrderAction(null, shopOrderId, "", "顺丰同城订单[" + shopOrderId + "]" + pushRemark, payload);
 
         return new ThirdApiRes().success("success");
     }
@@ -1118,10 +1120,10 @@ public class SFExpressApiServiceImpl implements SFExpressApiService {
         String orderId = shopStoreSfOrder.getShop_order_id();
 
         // 消息推送
-        JSONObject payload = new JSONObject();
-        payload.put("category", CommonConstant.PUSH_MSG_CATE_MCH_ORDER_DETAIL);
-        payload.put("orderId", orderId);
-        pushMessageService.noticeMerchantEmployeeOrderAction(null, orderId, "", "顺丰同城订单[" + orderId + "]已完成配送。", null);
+//        JSONObject payload = new JSONObject();
+//        payload.put("category", CommonConstant.PUSH_MSG_CATE_MCH_ORDER_DETAIL);
+//        payload.put("orderId", orderId);
+//        pushMessageService.noticeMerchantEmployeeOrderAction(null, orderId, "", "顺丰同城订单[" + orderId + "]已完成配送。", null);
 
 
         return new ThirdApiRes().success("success");
diff --git a/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml b/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml
index d491d650..ac55d2d7 100644
--- a/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml
+++ b/mall-shop/src/main/resources/mapper/order/ShopOrderBaseMapper.xml
@@ -576,6 +576,7 @@
         <result property="order_payment_amount" column="order_payment_amount"/>
         <result property="order_shipping_fee" column="order_shipping_fee"/>
         <result property="order_shipping_fee_inner" column="order_shipping_fee_inner"/>
+        <result property="lkl_fee" column="lkl_fee"/>
         <result property="packing_fee" column="packing_fee"/>
         <!--总计优惠金额 order_discount_amount + order_voucher_price + order_points_fee + order_adjust_fee-->
         <result property="total_discount_amount" column="total_discount_amount"/>
@@ -782,13 +783,14 @@
         oi.payment_time,
         od.order_shipping_fee,
         IFNULL(od.order_shipping_fee_inner, 0) as order_shipping_fee_inner,
+        IFNULL(od.lkl_fee, 0) as lkl_fee,
         <!--总计优惠金额 order_discount_amount + order_voucher_price + order_points_fee + order_adjust_fee-->
         (od.order_discount_amount + od.voucher_price + od.order_points_fee + od.order_adjust_fee) as
         total_discount_amount,
-        <!--预计收入：订单原价金额-总计优惠金额-配送费-平台费 + 打包费-->
-        (ob.order_product_amount-od.order_discount_amount-od.voucher_price-od.order_points_fee-od.order_adjust_fee-od.platform_fee-order_shipping_fee_inner+od.packing_fee)
+        <!--预计收入：订单原价金额-总计优惠金额-配送费-平台费-拉卡拉手续费 + 打包费-->
+        (ob.order_product_amount-od.order_discount_amount-od.voucher_price-od.order_points_fee-od.order_adjust_fee-od.platform_fee-order_shipping_fee_inner-lkl_fee+od.packing_fee)
         as order_income_amount,
-        od.platform_fee,
+        (od.platform_fee+lkl_fee) as platform_fee,
         od.packing_fee,
         od.order_message,
         sb.store_id,