fix 修改文案信息

kxmall-admin-api/src/main/java/com/kxmall/web/controller/order/KxDeliveryConfigController.java

@@ -55,7 +55,7 @@ public class KxDeliveryConfigController extends BaseController {
      * 新增配送配置
      */
     @SaCheckPermission("delivery:config:add")
-    @Log(title = "配送配置", businessType = BusinessType.INSERT)
+    @Log(title = "服务配置", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody KxDeliveryConfigBo bo) {
@@ -66,7 +66,7 @@ public class KxDeliveryConfigController extends BaseController {
      * 修改配送配置
      */
     @SaCheckPermission("delivery:config:edit")
-    @Log(title = "配送配置", businessType = BusinessType.UPDATE)
+    @Log(title = "服务配置", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody KxDeliveryConfigBo bo) {
@@ -77,7 +77,7 @@ public class KxDeliveryConfigController extends BaseController {
      * 删除配送配置
      */
     @SaCheckPermission("delivery:config:remove")
-    @Log(title = "配送配置", businessType = BusinessType.DELETE)
+    @Log(title = "服务配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ids) {
         return toAjax(iKxDeliveryConfigService.deleteWithValidByIds(Arrays.asList(ids), true));
@@ -96,7 +96,7 @@ public class KxDeliveryConfigController extends BaseController {
      * 设置默认配送配置
      */
     @SaCheckPermission("delivery:config:edit")
-    @Log(title = "配送配置", businessType = BusinessType.UPDATE)
+    @Log(title = "服务配置", businessType = BusinessType.UPDATE)
     @PostMapping("/setDefault/{id}")
     public R<Void> setDefault(@NotNull @PathVariable Long id) {
         return toAjax(iKxDeliveryConfigService.setDefaultConfig(id));

kxmall-admin-api/src/main/java/com/kxmall/web/controller/order/service/impl/KxDeliveryConfigServiceImpl.java

@@ -89,7 +89,7 @@ public class KxDeliveryConfigServiceImpl implements IKxDeliveryConfigService {
     private void validEntityBeforeSave(KxDeliveryConfig entity) {
         // 校验配送类型
         if (!Arrays.asList("DD", "SFTC", "SELF").contains(entity.getDeliveryType())) {
-            throw new ServiceException("配送类型不合法");
+            throw new ServiceException("服务类型不合法");
         }
 
         // 校验JSON配置

kxmall-admin-api/src/main/java/com/kxmall/web/controller/order/service/impl/KxStoreOrderServiceImpl.java

@@ -477,12 +477,12 @@ public class KxStoreOrderServiceImpl implements IKxStoreOrderService {
                 result = orderRiderBizService.comsumerOderMessageBusiness(orderMessageBO);
             }
             if (!result) {
-                throw new ServiceException("订单配送失败");
+                throw new ServiceException("订单服务失败");
             }
             return result;
         } catch (ServiceException e) {
             logger.error("【订单分配异常】 ", e);
-            throw new ServiceException("订单配送失败" + e.getMessage());
+            throw new ServiceException("订单服务失败" + e.getMessage());
         }
     }
 
@@ -625,20 +625,20 @@ public class KxStoreOrderServiceImpl implements IKxStoreOrderService {
 
         // 2. 检查订单状态是否允许分配配送
         if (!(OrderStatusType.WAIT_STOCK.getCode() == orderVo.getStatus())) {
-            throw new ServiceException("订单当前状态不允许分配配送");
+            throw new ServiceException("订单当前状态不允许分配服务");
         }
 
         // 3. 获取商户默认配送配置
         KxDeliveryConfig defaultConfig = deliveryConfigMapper.selectOne(new LambdaQueryWrapper<KxDeliveryConfig>().eq(KxDeliveryConfig::getIsDefault, true));
 
         if (defaultConfig == null) {
-            throw new ServiceException("未找到该商户的默认配送配置");
+            throw new ServiceException("未找到该商户的默认服务配置");
         }
 
         // 4. 根据配送类型调用不同的配送策略
         DeliveryStrategy strategy = deliveryStrategyFactory.getStrategy(defaultConfig.getDeliveryType());
         if (strategy == null) {
-            throw new ServiceException("不支持的配送类型: " + defaultConfig.getDeliveryType());
+            throw new ServiceException("不支持的服务类型: " + defaultConfig.getDeliveryType());
         }
 
 
@@ -646,7 +646,7 @@ public class KxStoreOrderServiceImpl implements IKxStoreOrderService {
         DeliveryResult result = strategy.createDelivery(orderVo, defaultConfig);
 
         if (!result.isSuccess()) {
-            throw new ServiceException("配送订单创建失败: " + result.getErrorMsg());
+            throw new ServiceException("服务订单创建失败: " + result.getErrorMsg());
         }
 
         // 7. 更新订单配送信息

kxmall-admin-api/src/main/java/com/kxmall/web/controller/rider/KxRiderAuthAttachmentController.java

@@ -1,10 +1,8 @@
 package com.kxmall.web.controller.rider;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
-import com.kxmall.common.annotation.Log;
 import com.kxmall.common.core.controller.BaseController;
 import com.kxmall.common.core.domain.R;
-import com.kxmall.common.enums.BusinessType;
 import com.kxmall.rider.domain.KxRiderAuthAttachment;
 import com.kxmall.web.controller.rider.service.IKxRiderAuthAttachmentService;
 import lombok.RequiredArgsConstructor;
@@ -14,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 /**
- * 骑手附件认证
+ * 师傅附件认证
  *
  * @author kxmall
  * @date 2025-01-27
@@ -28,7 +26,7 @@ public class KxRiderAuthAttachmentController extends BaseController {
     private final IKxRiderAuthAttachmentService attachmentService;
 
     /**
-     * 根据骑手ID查询附件列表
+     * 根据师傅ID查询附件列表
      */
     @SaCheckPermission("rider:rider:query")
     @GetMapping("/list/{riderId}")
@@ -41,7 +39,6 @@ public class KxRiderAuthAttachmentController extends BaseController {
      * 删除单个附件
      */
     @SaCheckPermission("rider:rider:edit")
-    @Log(title = "骑手附件", businessType = BusinessType.DELETE)
     @DeleteMapping("/{attachmentId}")
     public R<Void> deleteAttachment(@PathVariable Long attachmentId) {
         return toAjax(attachmentService.deleteAttachment(attachmentId));

kxmall-admin-api/src/main/java/com/kxmall/web/controller/rider/KxRiderController.java

@@ -56,7 +56,7 @@ public class KxRiderController extends BaseController {
     public R<Map<String, Object>> getRiderBankInfo(@PathVariable Long riderId) {
         KxRider rider = iKxRiderService.getById(riderId);
         if (rider == null) {
-            return R.fail("骑手不存在");
+            return R.fail("师傅不存在");
         }
         Map<String, Object> bankInfo = new HashMap<>();
         bankInfo.put("bankName", rider.getBankName());
@@ -67,10 +67,10 @@ public class KxRiderController extends BaseController {
     }
 
     /**
-     * 重置骑手登录密码
+     * 重置师傅登录密码
      */
     @SaCheckPermission("rider:rider:edit")
-    @Log(title = "配送-重置密码", businessType = BusinessType.UPDATE)
+    @Log(title = "服务-重置密码", businessType = BusinessType.UPDATE)
     @PostMapping("/resetPassword/{riderId}")
     public R<Void> resetRiderPassword(@PathVariable Long riderId) {
         return toAjax(iKxRiderService.resetRiderPassword(riderId));
@@ -90,11 +90,11 @@ public class KxRiderController extends BaseController {
      * 导出配送列表
      */
     @SaCheckPermission("rider:rider:export")
-    @Log(title = "配送", businessType = BusinessType.EXPORT)
+    @Log(title = "服务", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(KxRiderBo bo, HttpServletResponse response) {
         List<KxRiderVo> list = iKxRiderService.queryList(bo);
-        ExcelUtil.exportExcel(list, "配送", KxRiderVo.class, response);
+        ExcelUtil.exportExcel(list, "服务", KxRiderVo.class, response);
     }
 
     /**
@@ -113,7 +113,7 @@ public class KxRiderController extends BaseController {
      * 新增配送
      */
     @SaCheckPermission("rider:rider:add")
-    @Log(title = "配送", businessType = BusinessType.INSERT)
+    @Log(title = "服务", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody KxRiderBo bo) {
@@ -126,7 +126,7 @@ public class KxRiderController extends BaseController {
      * 修改配送
      */
     @SaCheckPermission("rider:rider:edit")
-    @Log(title = "配送", businessType = BusinessType.UPDATE)
+    @Log(title = "服务", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody KxRiderBo bo) {
@@ -139,7 +139,7 @@ public class KxRiderController extends BaseController {
      * @param ids 主键串
      */
     @SaCheckPermission("rider:rider:remove")
-    @Log(title = "配送", businessType = BusinessType.DELETE)
+    @Log(title = "服务", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
@@ -179,7 +179,7 @@ public class KxRiderController extends BaseController {
     }
 
     /**
-     * 获取指定骑手的推送订阅二维码
+     * 获取指定师傅的推送订阅二维码
      */
     @GetMapping("/getRiderQrcodeImage")
     public R<String> getRiderQrcodeImage(Long riderId){

kxmall-admin-api/src/main/java/com/kxmall/web/controller/rider/KxRiderOrderController.java

@@ -53,11 +53,11 @@ public class KxRiderOrderController extends BaseController {
      * 导出配送员订单信息列表
      */
     @SaCheckPermission("rider:riderOrder:export")
-    @Log(title = "配送员订单信息", businessType = BusinessType.EXPORT)
+    @Log(title = "师傅订单信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(KxRiderOrderBo bo, HttpServletResponse response) {
         List<KxRiderOrderVo> list = iKxRiderOrderService.queryList(bo);
-        ExcelUtil.exportExcel(list, "配送员订单信息", KxRiderOrderVo.class, response);
+        ExcelUtil.exportExcel(list, "师傅订单信息", KxRiderOrderVo.class, response);
     }
 
     /**
@@ -76,7 +76,7 @@ public class KxRiderOrderController extends BaseController {
      * 新增配送员订单信息
      */
     @SaCheckPermission("rider:riderOrder:add")
-    @Log(title = "配送员订单信息", businessType = BusinessType.INSERT)
+    @Log(title = "师傅订单信息", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody KxRiderOrderBo bo) {
@@ -87,7 +87,7 @@ public class KxRiderOrderController extends BaseController {
      * 修改配送员订单信息
      */
     @SaCheckPermission("rider:riderOrder:edit")
-    @Log(title = "配送员订单信息", businessType = BusinessType.UPDATE)
+    @Log(title = "师傅订单信息", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody KxRiderOrderBo bo) {
@@ -100,7 +100,7 @@ public class KxRiderOrderController extends BaseController {
      * @param ids 主键串
      */
     @SaCheckPermission("rider:riderOrder:remove")
-    @Log(title = "配送员订单信息", businessType = BusinessType.DELETE)
+    @Log(title = "师傅订单信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {

kxmall-admin-api/src/main/java/com/kxmall/web/controller/rider/service/impl/KxRiderServiceImpl.java

@@ -101,7 +101,7 @@ public class KxRiderServiceImpl implements IKxRiderService {
             
             return riderVo;
         }
-        throw new ServiceException("配送员不存在");
+        throw new ServiceException("师傅不存在");
     }
 
     /**
@@ -153,13 +153,13 @@ public class KxRiderServiceImpl implements IKxRiderService {
     @Transactional(rollbackFor = Exception.class)
     public Boolean insertByBo(KxRiderBo bo) {
         if (StringUtils.isEmpty(bo.getPhone())) {
-            throw new ServiceException("配送员手机号不能为空");
+            throw new ServiceException("师傅手机号不能为空");
         }
         QueryWrapper<KxRider> wrapper = new QueryWrapper<>();
         wrapper.eq("phone", bo.getPhone());
         Long phoneCount = baseMapper.selectCount(wrapper);
         if (phoneCount > 0) {
-            throw new ServiceException("配送员手机号已经存在");
+            throw new ServiceException("师傅手机号已经存在");
         }
         KxRider add = BeanUtil.toBean(bo, KxRider.class);
 
@@ -217,15 +217,15 @@ public class KxRiderServiceImpl implements IKxRiderService {
     @Override
     public Boolean updateByBo(KxRiderBo bo) {
         if (StringUtils.isEmpty(bo.getPhone())) {
-            throw new ServiceException("配送员手机号不能为空");
+            throw new ServiceException("师傅手机号不能为空");
         }
         QueryWrapper<KxRider> wrapper = new QueryWrapper<>();
         wrapper.eq("phone", bo.getPhone());
         List<KxRider> kxRiders = baseMapper.selectList(wrapper);
         if (kxRiders != null && kxRiders.size() > 1) {
-            throw new ServiceException("配送员手机号已经存在");
+            throw new ServiceException("师傅手机号已经存在");
         } else if (kxRiders != null && kxRiders.size() == 1 && !kxRiders.get(0).getId().equals(bo.getId())) {
-            throw new ServiceException("配送员手机号已经存在");
+            throw new ServiceException("师傅手机号已经存在");
         }
 
         KxRider update = BeanUtil.toBean(bo, KxRider.class);
@@ -338,10 +338,10 @@ public class KxRiderServiceImpl implements IKxRiderService {
     public String updateStateToNomral(String idsJson) throws ServiceException {
         List<Long> ids = JSONObject.parseArray(idsJson, Long.class);
         if (CollectionUtils.isEmpty(ids)) {
-            throw new ServiceException("配送员不存在");
+            throw new ServiceException("师傅不存在");
         }
         if (baseMapper.batchUpdateState(ids, RiderStatusType.NOMRAL.getCode()) <= 0) {
-            throw new ServiceException("配送员不存在");
+            throw new ServiceException("师傅不存在");
         }
         return "ok";
     }
@@ -351,12 +351,12 @@ public class KxRiderServiceImpl implements IKxRiderService {
     public String updateStateToAbort(String idsJson) throws ServiceException {
         List<Long> ids = JSONObject.parseArray(idsJson, Long.class);
         if (CollectionUtils.isEmpty(ids)) {
-            throw new ServiceException("配送员不存在");
+            throw new ServiceException("师傅不存在");
         }
 
         //禁用的同时，将状态调整为休息中
         if (baseMapper.batchUpdateState(ids, RiderStatusType.ABORT.getCode()) <= 0 || baseMapper.batchUpdateWeekState(ids, RiderWorkStateType.REST.getCode()) <= 0) {
-            throw new ServiceException("配送员不存在");
+            throw new ServiceException("师傅不存在");
         }
         return "ok";
     }
@@ -366,10 +366,10 @@ public class KxRiderServiceImpl implements IKxRiderService {
     public String updateBusinessWorkState(String idsJson) throws ServiceException {
         List<Long> ids = JSONObject.parseArray(idsJson, Long.class);
         if (CollectionUtils.isEmpty(ids)) {
-            throw new ServiceException("配送员不存在");
+            throw new ServiceException("师傅不存在");
         }
         if (baseMapper.batchUpdateWeekState(ids, RiderWorkStateType.WORKING.getCode()) <= 0) {
-            throw new ServiceException("配送员不存在");
+            throw new ServiceException("师傅不存在");
         }
         return "ok";
     }
@@ -378,10 +378,10 @@ public class KxRiderServiceImpl implements IKxRiderService {
     public String updateBusinessStateToRest(String idsJson) throws ServiceException {
         List<Long> ids = JSONObject.parseArray(idsJson, Long.class);
         if (CollectionUtils.isEmpty(ids)) {
-            throw new ServiceException("配送员不存在");
+            throw new ServiceException("师傅不存在");
         }
         if (baseMapper.batchUpdateWeekState(ids, RiderWorkStateType.WORKING.getCode()) <= 0) {
-            throw new ServiceException("配送员不存在");
+            throw new ServiceException("师傅不存在");
         }
         return "ok";
     }
@@ -420,11 +420,11 @@ public class KxRiderServiceImpl implements IKxRiderService {
     public Boolean resetRiderPassword(Long riderId) {
         KxRider rider = baseMapper.selectById(riderId);
         if (rider == null) {
-            throw new ServiceException("骑手不存在");
+            throw new ServiceException("师傅不存在");
         }
         String phone = rider.getPhone();
         if (StringUtils.isEmpty(phone)) {
-            throw new ServiceException("骑手手机号不存在，无法重置密码");
+            throw new ServiceException("师傅手机号不存在，无法重置密码");
         }
         String saltSource = phone.length() >= 7 ? phone.substring(0, 7) : phone;
         String cryptPassword = Md5Crypt.md5Crypt(ININT_PASSWORD.getBytes(), "$1$" + saltSource);

kxmall-admin/src/main/resources/logback-spring.xml

@@ -12,11 +12,13 @@
     <conversionRule conversionWord="wEx"
                     converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
 
-    <!-- 日志格式定义 -->
+    <!-- 彩色日志格式 -->
     <property name="CONSOLE_LOG_PATTERN"
-              value="%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(%-5level) %clr([%15.15thread]){magenta} %clr(%-40.40logger{60}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}"/>
+              value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) [%X{reqId}] %clr(---){faint} %clr([%20t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+    <!-- 日志格式定义 -->
     <property name="FILE_LOG_PATTERN"
-              value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n"/>
+              value="%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level [%X{reqId}] %logger{50} - %msg%n"/>
 
     <!-- 控制台输出 -->
     <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
@@ -163,7 +165,7 @@
     </springProfile>
 
     <!-- 生产环境配置 -->
-    <root level="info">
+    <root level="debug">
         <appender-ref ref="INFO_FILE" />
         <appender-ref ref="FILE_CONSOLE"/>
         <appender-ref ref="ASYNC_INFO"/>

kxmall-app-api/src/main/java/com/kxmall/web/controller/order/service/impl/KxAppOrderService.java

@@ -257,7 +257,7 @@ public class KxAppOrderService implements IKxAppOrderService {
 
         if (ObjectUtils.isEmpty(orderRequestBo.getAddressId())) {
             result.setTotalPrice(new BigDecimal("-1"));
-            result.setMsg("配送地址未填写！");
+            result.setMsg("服务地址未填写！");
             return result;
         }
 
@@ -322,7 +322,7 @@ public class KxAppOrderService implements IKxAppOrderService {
             }
         }
         result.setTotalPrice(new BigDecimal("-1"));
-        result.setMsg("不予配送");
+        result.setMsg("不予服务");
         return result;
     }
 

kxmall-common/src/main/java/com/kxmall/common/enums/OrderStatusType.java

@@ -32,9 +32,9 @@ public enum OrderStatusType {
      */
     WAIT_CONFIRM(30, "待收货"),
 
-    TRANS_ABNORMAL(32, "配送异常"),
+    TRANS_ABNORMAL(32, "服务异常"),
 
-    TIME_OUT(34, "配送超时"),
+    TIME_OUT(34, "服务超时"),
 
     /**
      * 完成服务

kxmall-common/src/main/java/com/kxmall/common/enums/RiderOrderAbnormalType.java

@@ -8,7 +8,7 @@ package com.kxmall.common.enums;
 public enum RiderOrderAbnormalType {
 
     TIMEOUT(2, "超时"),
-    ABNORMAL(3, "配送异常");
+    ABNORMAL(3, "服务异常");
     private Integer code;
 
     private String msg;

kxmall-common/src/main/java/com/kxmall/common/enums/SfCallbackType.java

@@ -3,10 +3,10 @@ package com.kxmall.common.enums;
 
 public enum SfCallbackType {
 
-    ORDER_STATUS_CHANGE("status", "配送状态更改"),
+    ORDER_STATUS_CHANGE("status", "服务状态更改"),
     ORDER_COMPLETE("complete", "订单完成"),
     SF_CANCEL("sf_cancel", "顺丰原因取消"),
-    ORDER_EXCEPTION("exception", "订单配送异常"),
+    ORDER_EXCEPTION("exception", "订单服务异常"),
     RIDER_CANCEL("rider_cancel", "骑士撤单"),
     AUTH_CALLBACK("auth", "授权回调"),
     AUTO_SHOP_CALLBACK("auto_shop", "自动建店回调"),

kxmall-common/src/main/java/com/kxmall/common/event/TemplateListenEnum.java

@@ -13,10 +13,12 @@ import java.util.stream.Stream;
 @Getter
 @AllArgsConstructor
 public enum TemplateListenEnum {
+
     TYPE_1("1","商家微信通知"),
-    TYPE_2("2","骑手微信通知");
-    private String value;
-    private String desc;
+    TYPE_2("2","师傅微信通知");
+
+    private final String value;
+    private final String desc;
 
     public static TemplateListenEnum toType(String value) {
         return Stream.of(TemplateListenEnum.values())

kxmall-common/src/main/java/com/kxmall/common/filter/KxMallFilter.java

@@ -5,6 +5,7 @@ import cn.hutool.core.lang.UUID;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.http.ContentType;
 import lombok.extern.slf4j.Slf4j;
+import org.slf4j.MDC;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.*;
@@ -40,6 +41,9 @@ public class KxMallFilter implements Filter {
         }
 
         log.debug("=============== 【Task start】 {} ===============", taskId);
+        String reqId = taskId.toString().split("-")[0];
+        MDC.put("reqId", reqId);
+
         log.debug("URI：     {}", requestUri);
         log.debug("IP：      {}", address);
         log.debug("Params:   {}", casterHttpServletRequestWrapper.getParam());
@@ -48,6 +52,7 @@ public class KxMallFilter implements Filter {
 
         chain.doFilter(casterHttpServletRequestWrapper, response);
 
+        MDC.clear();
         stopWatch.stop();
         log.debug("=============== 【Task end】 {} 。using  【{}ms】 ===============", taskId, stopWatch.getLastTaskTimeMillis());
     }

kxmall-common/src/main/java/com/kxmall/common/utils/FeieyunPrint.java

@@ -178,7 +178,7 @@ public class FeieyunPrint {
         //<W></W>字体变宽一倍,"<QR></QR>"为二维码,"<BOLD></BOLD>"为字体加粗,"<RIGHT></RIGHT>"为右对齐
         //拼凑订单内容时可参考如下格式
         //根据打印纸张的宽度，自行调整内容的格式，可参考下面的样例格式
-        String orderType = printBean.getOrderType() == 1 ? "配送单" : "自提单";
+        String orderType = printBean.getOrderType() == 1 ? "服务单" : "自提单";
         String content;
         content = "<CB>" + printBean.getStorageName() + "</CB><BR>";
         content += "<CB>" + orderType + "</CB><BR>";

kxmall-framework/src/main/java/com/kxmall/framework/config/MybatisPlusConfig.java

@@ -25,6 +25,11 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
 @MapperScan("${mybatis-plus.mapperPackage}")
 public class MybatisPlusConfig {
 
+    @Bean
+    public MybatisLogInterceptor sqlLogInterceptor() {
+        return new MybatisLogInterceptor();
+    }
+
     @Bean
     public MybatisPlusInterceptor mybatisPlusInterceptor() {
         MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
@@ -34,8 +39,6 @@ public class MybatisPlusConfig {
         interceptor.addInnerInterceptor(paginationInnerInterceptor());
         // 乐观锁插件
         interceptor.addInnerInterceptor(optimisticLockerInnerInterceptor());
-
-        interceptor.addInnerInterceptor(new MybatisLogInterceptor());
         return interceptor;
     }
 

kxmall-framework/src/main/java/com/kxmall/framework/mp/MybatisLogInterceptor.java

@@ -1,119 +1,87 @@
 package com.kxmall.framework.mp;
 
-import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.mapping.BoundSql;
 import org.apache.ibatis.mapping.MappedStatement;
-import org.apache.ibatis.reflection.MetaObject;
-import org.apache.ibatis.reflection.SystemMetaObject;
-import org.apache.ibatis.session.ResultHandler;
-import org.apache.ibatis.session.RowBounds;
+import org.apache.ibatis.plugin.Interceptor;
+import org.apache.ibatis.plugin.Intercepts;
+import org.apache.ibatis.plugin.Invocation;
+import org.apache.ibatis.plugin.Signature;
+import org.apache.ibatis.scripting.defaults.DefaultParameterHandler;
 
-import java.sql.SQLException;
-import java.text.DateFormat;
-import java.util.ArrayList;
-import java.util.Date;
+import java.sql.PreparedStatement;
 import java.util.List;
-import java.util.Map;
-import java.util.regex.Matcher;
 
-public class MybatisLogInterceptor implements InnerInterceptor {
-
-    private final ThreadLocal<Long> startTime = new ThreadLocal<>();
+@Slf4j
+@Intercepts({
+        @Signature(type = Executor.class, method = "query",
+                args = {MappedStatement.class, Object.class,
+                        org.apache.ibatis.session.RowBounds.class,
+                        org.apache.ibatis.session.ResultHandler.class,
+                        org.apache.ibatis.cache.CacheKey.class,
+                        BoundSql.class}),
+        @Signature(type = Executor.class, method = "update",
+                args = {MappedStatement.class, Object.class})
+})
+public class MybatisLogInterceptor implements Interceptor {
 
     @Override
-    public void beforeQuery(Executor executor, MappedStatement ms, Object parameter,
-                            RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) {
-        startTime.set(System.currentTimeMillis());
-        String sql = buildSql(boundSql, parameter);
-        System.out.println("==> SQL: " + sql);
-    }
+    public Object intercept(Invocation invocation) throws Throwable {
+        MappedStatement ms = (MappedStatement) invocation.getArgs()[0];
+        Object parameter = invocation.getArgs()[1];
+        BoundSql boundSql;
 
-    @Override
-    public boolean willDoQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) throws SQLException {
-        return InnerInterceptor.super.willDoQuery(executor, ms, parameter, rowBounds, resultHandler, boundSql);
-    }
+        // query 有 6 个参数，update 有 2 个参数
+        if (invocation.getArgs().length == 6) {
+            boundSql = (BoundSql) invocation.getArgs()[5];
+        } else {
+            boundSql = ms.getBoundSql(parameter);
+        }
 
-    public void afterQuery(Executor executor, MappedStatement ms, Object parameter,
-                           RowBounds rowBounds, ResultHandler resultHandler,
-                           BoundSql boundSql, List resultList) {
-        long cost = System.currentTimeMillis() - startTime.get();
-        System.out.println("==> Rows: " + (resultList == null ? 0 : resultList.size()) + " | Cost: " + cost + " ms");
-        startTime.remove();
-    }
+        // 替换参数后的 SQL
+        String sql = buildSql(ms, boundSql, parameter);
+        log.debug("==>  Preparing:  {}", sql);
 
-    @Override
-    public void beforeUpdate(Executor executor, MappedStatement ms, Object parameter) {
-        startTime.set(System.currentTimeMillis());
-        BoundSql boundSql = ms.getBoundSql(parameter);
-        String sql = buildSql(boundSql, parameter);
-        System.out.println("==> SQL: " + sql);
-    }
+        // 执行原方法
+        Object result = invocation.proceed();
 
-    public void afterUpdate(Executor executor, MappedStatement ms, Object parameter, int rowCount) {
-        long cost = System.currentTimeMillis() - startTime.get();
-        System.out.println("==> Rows: " + rowCount + " | Cost: " + cost + " ms");
-        startTime.remove();
-    }
-
-    private String buildSql(BoundSql boundSql, Object parameterObject) {
-        String sql = boundSql.getSql().replaceAll("\\s+", " ");
-        List<Object> params = new ArrayList<>();
+        // 打印行数
+        Object num = null;
+        if (result instanceof List) {
+            num = ((List<?>) result).size();
+        } else if (result instanceof Number) {
+            num = result;
+        }
 
-        if (boundSql.getParameterMappings() != null) {
-            boundSql.getParameterMappings().forEach(pm -> {
-                String propertyName = pm.getProperty();
-                Object value;
+        log.debug("<==      Total:  {}", num);
 
-                if (boundSql.hasAdditionalParameter(propertyName)) {
-                    // 处理动态参数（如 foreach 或 wrapper 里的 paramNameValuePairs）
-                    value = boundSql.getAdditionalParameter(propertyName);
-                } else if (parameterObject == null) {
-                    value = null;
-                } else if (parameterObject instanceof Map) {
-                    // 如果是 Map，优先直接取
-                    value = ((Map<?, ?>) parameterObject).get(propertyName);
-                    // 兼容 MP 的 ew.paramNameValuePairs.MPGENVAL1
-                    if (value == null && propertyName.contains(".")) {
-                        try {
-                            MetaObject metaObject = SystemMetaObject.forObject(parameterObject);
-                            value = metaObject.getValue(propertyName);
-                        } catch (Exception ignore) {
-                        }
-                    }
-                } else {
-                    try {
-                        MetaObject metaObject = SystemMetaObject.forObject(parameterObject);
-                        value = metaObject.getValue(propertyName);
-                    } catch (Exception e) {
-                        value = null;
-                    }
-                }
-                params.add(value);
-            });
-        }
-        return formatSql(sql, params);
+        return result;
     }
 
+    /**
+     * 拼接参数后的完整 SQL
+     */
+    private String buildSql(MappedStatement ms, BoundSql boundSql, Object parameter) {
+        String sql = boundSql.getSql().replaceAll("\\s+", " ");
+        try {
+            PreparedStatement ps = ms.getConfiguration()
+                    .getEnvironment()
+                    .getDataSource()
+                    .getConnection()
+                    .prepareStatement(sql);
+            DefaultParameterHandler handler =
+                    new DefaultParameterHandler(ms, parameter, boundSql);
+            handler.setParameters(ps);
+            String fullSql = ps.toString();
+            ps.close();
 
-    private String formatSql(String sql, List<Object> params) {
-        if (params == null || params.isEmpty()) {
+            // 去掉前缀 "Preparing: " 之类的
+            int idx = fullSql.indexOf(':');
+            return idx > 0 ? fullSql.substring(idx + 1).trim() : fullSql;
+        } catch (Exception e) {
+            log.warn("SQL 拼接失败，使用原始 SQL: {}", sql, e);
             return sql;
         }
-        for (Object param : params) {
-            String value;
-            if (param == null) {
-                value = "null";
-            } else if (param instanceof String) {
-                value = "'" + param + "'";
-            } else if (param instanceof Date) {
-                DateFormat df = DateFormat.getDateTimeInstance();
-                value = "'" + df.format((Date) param) + "'";
-            } else {
-                value = param.toString();
-            }
-            sql = sql.replaceFirst("\\?", Matcher.quoteReplacement(value));
-        }
-        return sql;
     }
 }

kxmall-rider-api/src/main/java/com/kxmall/web/controller/rider/RiderController.java

@@ -77,7 +77,7 @@ public class RiderController extends BaseRiderController {
         Long riderId = getRiderLoginUser().getUserId();
         KxRider rider = riderInfoService.getById(riderId);
         if (rider == null) {
-            return R.fail("骑手不存在");
+            return R.fail("师傅不存在");
         }
 
         // 只返回需要的字段

kxmall-rider-api/src/main/java/com/kxmall/web/controller/rider/RiderWalletController.java

@@ -30,7 +30,7 @@ public class RiderWalletController extends BaseRiderController {
         // 从token中获取当前登录骑手ID
         Long riderId = getUserId();
         if (riderId == null) {
-            return R.fail("未获取到骑手信息");
+            return R.fail("未获取到师傅信息");
         }
         return R.ok(riderWalletService.getWalletInfo(riderId));
     }

kxmall-rider-api/src/main/java/com/kxmall/web/controller/rider/service/impl/KxRiderWalletServiceImpl.java

@@ -31,7 +31,7 @@ public class KxRiderWalletServiceImpl implements IKxRiderWalletService {
         // 1. 获取骑手基本信息
         KxRider rider = riderMapper.selectById(riderId);
         if (rider == null) {
-            throw new RuntimeException("骑手不存在");
+            throw new RuntimeException("师傅不存在");
         }
 
         // 2. 计算累计消费（从交易记录表中统计）

kxmall-rider-api/src/main/java/com/kxmall/web/controller/rider/service/impl/RiderInfoServiceImpl.java

@@ -45,7 +45,7 @@ public class RiderInfoServiceImpl implements RiderInfoService {
             throw new ServiceException("密码错误!");
         }
         if (kxRider.getState() == RiderStatusType.ABORT.getCode()) {
-            throw new ServiceException("骑手处于禁用状态，请联系管理员");
+            throw new ServiceException("师傅处于禁用状态，请联系管理员");
         }
         RiderLoginDTO riderLoginDTO = new RiderLoginDTO();
         BeanUtils.copyProperties(kxRider, riderLoginDTO);
@@ -81,7 +81,7 @@ public class RiderInfoServiceImpl implements RiderInfoService {
         if (riderMapper.updateById(riderDO) > 0) {
             return "ok";
         }
-        throw new ServiceException("配送员信息更新异常");
+        throw new ServiceException("师傅信息更新异常");
     }
 
     @Override
@@ -92,7 +92,7 @@ public class RiderInfoServiceImpl implements RiderInfoService {
         if (riderMapper.updateById(riderDO) > 0) {
             return "ok";
         }
-        throw new ServiceException("配送员信息更新异常");
+        throw new ServiceException("师傅信息更新异常");
     }
 
     @Override
@@ -103,7 +103,7 @@ public class RiderInfoServiceImpl implements RiderInfoService {
             BeanUtils.copyProperties(riderDO, riderLoginDTO);
             return riderLoginDTO;
         }
-        throw new ServiceException("配送员不存在");
+        throw new ServiceException("师傅不存在");
     }
 
     @Override
@@ -112,7 +112,7 @@ public class RiderInfoServiceImpl implements RiderInfoService {
         if (riderDO != null) {
             return riderDO;
         }
-        throw new ServiceException("配送员不存在");
+        throw new ServiceException("师傅不存在");
     }
 
     @Override

kxmall-rider-api/src/main/java/com/kxmall/web/controller/rider/service/impl/RiderWxLoginServiceImpl.java

@@ -134,7 +134,7 @@ public class RiderWxLoginServiceImpl implements RiderWxLoginService {
         } catch (ServiceException e) {
             throw e;
         } catch (Exception e) {
-            logger.error("[骑手小程序登录] 异常", e);
+            logger.error("[师傅小程序登录] 异常", e);
             throw new ServiceException("用户第三方登录失败");
         }
 

kxmall-rider-api/src/main/java/com/kxmall/web/controller/task/service/impl/TaskCenterServiceImpl.java

@@ -66,7 +66,7 @@ public class TaskCenterServiceImpl implements TaskCenterService {
     @Override
     public TableDataInfo<KxRiderOrderVo> list(Integer status, Integer page, Integer limit, Long riderId) throws ServiceException {
         if (Objects.isNull(status)) {
-            throw new ServiceException("骑手订单状态不存在");
+            throw new ServiceException("师傅订单状态不存在");
         }
 
         if (RiderOrderStatusType.WAITING.getCode().equals(status)) {
@@ -94,13 +94,13 @@ public class TaskCenterServiceImpl implements TaskCenterService {
     public KxRiderOrderVo detail(Long riderOrderId, Long riderId) throws ServiceException {
         KxRiderOrder riderOrderDO = riderOrderMapper.selectById(riderOrderId);
         if (riderOrderDO == null) {
-            throw new ServiceException("骑手订单不存在！");
+            throw new ServiceException("师傅订单不存在！");
         }
         QueryWrapper<KxRiderItem> wrapper = new QueryWrapper<>();
         wrapper.eq("rider_order_id", riderOrderId);
         List<KxRiderItemVo> riderSpuDOs = riderSpuMapper.selectVoList(wrapper);
         if (CollUtil.isEmpty(riderSpuDOs)) {
-            throw new ServiceException("骑手订单商品不存在！");
+            throw new ServiceException("师傅订单商品不存在！");
         }
         KxRiderOrderVo riderOrderDTO = new KxRiderOrderVo();
         BeanUtils.copyProperties(riderOrderDO, riderOrderDTO);
@@ -121,10 +121,10 @@ public class TaskCenterServiceImpl implements TaskCenterService {
     public String begin(Long riderOrderId, BigDecimal lng, BigDecimal lat, Long riderId) throws ServiceException {
         KxRiderOrder riderOrderDO = riderOrderMapper.selectById(riderOrderId);
         if (riderOrderDO == null) {
-            throw new ServiceException("配送员订单不存在");
+            throw new ServiceException("师傅订单不存在");
         }
         if (!((RiderOrderStatusType.IN_ROAD.getCode()).equals(riderOrderDO.getStatus()) || (RiderOrderStatusType.ABNORMAL.getCode()).equals(riderOrderDO.getStatus()))) {
-            throw new ServiceException("当前配送员订单状态不能执行该操作");
+            throw new ServiceException("当前师傅订单状态不能执行该操作");
         }
         String orderNo = riderOrderDO.getOrderNo();
         Lock lock = RedisUtils.lock(RIDER_ORDER_STATUS_LOCK + orderNo);
@@ -138,13 +138,13 @@ public class TaskCenterServiceImpl implements TaskCenterService {
                     orderRiderBizService.sendRiderMessageBusiness(riderOrderDO.getOrderNo(), RiderOrderStatusType.WORKING, riderOrderDO.getRiderId(), null);
                     return "ok";
                 }
-                throw new ServiceException("配送员订单状态更新异常，请稍后再试");
+                throw new ServiceException("师傅订单状态更新异常，请稍后再试");
             } else {
-                throw new ServiceException("配送订单系统繁忙~");
+                throw new ServiceException("服务订单系统繁忙~");
             }
         } catch (Exception e) {
-            logger.error("[订单配送状态变更] 异常", e);
-            throw new ServiceException("配送订单系统未知异常");
+            logger.error("[订单服务状态变更] 异常", e);
+            throw new ServiceException("服务订单系统未知异常");
         } finally {
             lock.unlock();
         }
@@ -154,10 +154,10 @@ public class TaskCenterServiceImpl implements TaskCenterService {
     public String abnormal(Long riderOrderId, String reason, BigDecimal lng, BigDecimal lat, Long riderId) throws ServiceException {
         KxRiderOrder riderOrderDO = riderOrderMapper.selectById(riderOrderId);
         if (riderOrderDO == null) {
-            throw new ServiceException("配送员订单不存在");
+            throw new ServiceException("师傅订单不存在");
         }
         if (!((RiderOrderStatusType.IN_ROAD.getCode()).equals(riderOrderDO.getStatus()))) {
-            throw new ServiceException("当前配送员订单状态不能执行该操作");
+            throw new ServiceException("当前师傅订单状态不能执行该操作");
         }
         String orderNo = riderOrderDO.getOrderNo();
         Lock lock = RedisUtils.lock(RIDER_ORDER_STATUS_LOCK + orderNo);
@@ -172,13 +172,13 @@ public class TaskCenterServiceImpl implements TaskCenterService {
                     orderRiderBizService.sendRiderMessageBusiness(riderOrderDO.getOrderNo(), RiderOrderStatusType.ABNORMAL, riderOrderDO.getRiderId(), reason);
                     return "ok";
                 }
-                throw new ServiceException("配送员订单状态更新异常，请稍后再试");
+                throw new ServiceException("师傅订单状态更新异常，请稍后再试");
             } else {
-                throw new ServiceException("配送订单系统繁忙~");
+                throw new ServiceException("服务订单系统繁忙~");
             }
         } catch (Exception e) {
-            logger.error("[订单配送状态变更] 异常", e);
-            throw new ServiceException("配送订单系统未知异常");
+            logger.error("[订单服务状态变更] 异常", e);
+            throw new ServiceException("服务订单系统未知异常");
         } finally {
             lock.unlock();
         }
@@ -189,11 +189,11 @@ public class TaskCenterServiceImpl implements TaskCenterService {
     public String complete(Long riderOrderId, BigDecimal lng, BigDecimal lat, Long riderId) throws ServiceException {
         KxRiderOrder riderOrderDO = riderOrderMapper.selectById(riderOrderId);
         if (riderOrderDO == null) {
-            throw new ServiceException("配送员订单不存在");
+            throw new ServiceException("师傅订单不存在");
         }
         if (!((RiderOrderStatusType.WORKING.getCode()).equals(riderOrderDO.getStatus())
                 || (RiderOrderStatusType.ABNORMAL.getCode()).equals(riderOrderDO.getStatus()))) {
-            throw new ServiceException("当前配送员订单状态不能执行该操作");
+            throw new ServiceException("当前师傅订单状态不能执行该操作");
         }
         String orderNo = riderOrderDO.getOrderNo();
         Lock lock = RedisUtils.lock(RIDER_ORDER_STATUS_LOCK + orderNo);
@@ -216,13 +216,13 @@ public class TaskCenterServiceImpl implements TaskCenterService {
                     orderRiderBizService.sendRiderMessageBusiness(riderOrderDO.getOrderNo(), RiderOrderStatusType.COMPLETED, riderOrderDO.getRiderId(), null);
                     return "ok";
                 }
-                throw new ServiceException("配送员订单状态更新异常，请稍后再试");
+                throw new ServiceException("师傅订单状态更新异常，请稍后再试");
             } else {
-                throw new ServiceException("配送订单系统繁忙~");
+                throw new ServiceException("服务订单系统繁忙~");
             }
         } catch (Exception e) {
-            logger.error("[订单配送状态变更] 异常", e);
-            throw new ServiceException("配送订单系统未知异常");
+            logger.error("[订单服务状态变更] 异常", e);
+            throw new ServiceException("服务订单系统未知异常");
         } finally {
             lock.unlock();
         }
@@ -235,7 +235,7 @@ public class TaskCenterServiceImpl implements TaskCenterService {
         // 查询骑手信息
         KxRider rider = riderMapper.selectById(riderId);
         if (rider == null) {
-            throw new ServiceException("骑手信息不存在");
+            throw new ServiceException("师傅信息不存在");
         }
 
         // 计算新的余额
@@ -257,7 +257,7 @@ public class TaskCenterServiceImpl implements TaskCenterService {
         transaction.setTransactionType(RiderTransactionType.INCOME.getCode()); // 1:收入
         transaction.setTransactionSource(RiderTransactionSource.DELIVERY_FEE.getCode()); // 1:配送费
         transaction.setOrderNo(orderNo);
-        transaction.setRemark("订单配送费收入");
+        transaction.setRemark("订单服务费收入");
         transaction.setStatus(1); // 1:成功
 
         riderWalletTransactionMapper.insert(transaction);
@@ -347,10 +347,10 @@ public class TaskCenterServiceImpl implements TaskCenterService {
     public String inRoad(Long riderOrderId, BigDecimal lng, BigDecimal lat, Long riderId) {
         KxRiderOrder riderOrderDO = riderOrderMapper.selectById(riderOrderId);
         if (riderOrderDO == null) {
-            throw new ServiceException("配送员订单不存在");
+            throw new ServiceException("师傅订单不存在");
         }
         if (!((RiderOrderStatusType.ALLOCATED.getCode()).equals(riderOrderDO.getStatus()) || (RiderOrderStatusType.ABNORMAL.getCode()).equals(riderOrderDO.getStatus()))) {
-            throw new ServiceException("当前配送员订单状态不能执行该操作");
+            throw new ServiceException("当前师傅订单状态不能执行该操作");
         }
         String orderNo = riderOrderDO.getOrderNo();
         Lock lock = RedisUtils.lock(RIDER_ORDER_STATUS_LOCK + orderNo);
@@ -369,13 +369,13 @@ public class TaskCenterServiceImpl implements TaskCenterService {
                     orderSnapshotService.addOrderSnapshotByOrderStatus(riderOrderDO.getId(), riderId, OrderSnapshotState.IN_ROAD);
                     return "ok";
                 }
-                throw new ServiceException("配送员订单状态更新异常，请稍后再试");
+                throw new ServiceException("师傅订单状态更新异常，请稍后再试");
             } else {
-                throw new ServiceException("配送订单系统繁忙，请稍后再试~");
+                throw new ServiceException("服务订单系统繁忙，请稍后再试~");
             }
         } catch (Exception e) {
-            logger.error("[订单配送状态变更] 异常", e);
-            throw new ServiceException("配送订单系统未知异常");
+            logger.error("[订单服务状态变更] 异常", e);
+            throw new ServiceException("服务订单系统未知异常");
         } finally {
             lock.unlock();
         }
@@ -385,10 +385,10 @@ public class TaskCenterServiceImpl implements TaskCenterService {
     public String accept(Long riderOrderId, BigDecimal lng, BigDecimal lat, Long riderId) {
         KxRiderOrder riderOrderDO = riderOrderMapper.selectById(riderOrderId);
         if (riderOrderDO == null) {
-            throw new ServiceException("配送员订单不存在");
+            throw new ServiceException("师傅订单不存在");
         }
         if (!((RiderOrderStatusType.WAITING.getCode()).equals(riderOrderDO.getStatus()) || (RiderOrderStatusType.ABNORMAL.getCode()).equals(riderOrderDO.getStatus()))) {
-            throw new ServiceException("当前配送员订单状态不能执行该操作");
+            throw new ServiceException("当前师傅订单状态不能执行该操作");
         }
         String orderNo = riderOrderDO.getOrderNo();
         Lock lock = RedisUtils.lock(RIDER_ORDER_STATUS_LOCK + orderNo);
@@ -406,13 +406,13 @@ public class TaskCenterServiceImpl implements TaskCenterService {
                     orderSnapshotService.addOrderSnapshotByOrderStatus(riderOrderDO.getId(), riderId, OrderSnapshotState.WAIT_BEGIN);
                     return "ok";
                 }
-                throw new ServiceException("配送员订单状态更新异常，请稍后再试");
+                throw new ServiceException("师傅订单状态更新异常，请稍后再试");
             } else {
-                throw new ServiceException("配送订单系统繁忙，请稍后再试~");
+                throw new ServiceException("服务订单系统繁忙，请稍后再试~");
             }
         } catch (Exception e) {
-            logger.error("[订单配送状态变更] 异常", e);
-            throw new ServiceException("配送订单系统未知异常");
+            logger.error("[订单服务状态变更] 异常", e);
+            throw new ServiceException("服务订单系统未知异常");
         } finally {
             lock.unlock();
         }

kxmall-rider-api/src/main/java/com/kxmall/web/controller/websocket/RiderWebSocketController.java

@@ -52,10 +52,10 @@ public class RiderWebSocketController {
     public R<Void> sendMessageToRider(@PathVariable String riderId, @RequestBody String message) {
         try {
             RiderWebSocketServer.sendInfo(message, riderId);
-            log.info("向骑手{}发送消息成功: {}", riderId, message);
+            log.info("向师傅{}发送消息成功: {}", riderId, message);
             return R.ok();
         } catch (Exception e) {
-            log.error("向骑手{}发送消息失败", riderId, e);
+            log.error("向师傅{}发送消息失败", riderId, e);
             return R.fail("发送消息失败: " + e.getMessage());
         }
     }
@@ -93,10 +93,10 @@ public class RiderWebSocketController {
             notification.setMatchScore(85.5);
 
             RiderWebSocketServer.sendOrderNotification(riderId, notification);
-            log.info("向骑手{}发送测试订单通知成功", riderId);
+            log.info("向师傅{}发送测试订单通知成功", riderId);
             return R.ok();
         } catch (Exception e) {
-            log.error("向骑手{}发送测试订单通知失败", riderId, e);
+            log.error("向师傅{}发送测试订单通知失败", riderId, e);
             return R.fail("发送测试通知失败: " + e.getMessage());
         }
     }

kxmall-rider-api/src/main/java/com/kxmall/web/controller/websocket/RiderWebSocketServer.java

@@ -51,12 +51,12 @@ public class RiderWebSocketServer {
             addOnlineCount();
         }
 
-        log.info("骑手{}连接WebSocket成功，当前在线人数为：{}", riderId, getOnlineCount());
+        log.info("师傅{}连接WebSocket成功，当前在线人数为：{}", riderId, getOnlineCount());
         
         try {
             sendMessage("连接成功");
         } catch (IOException e) {
-            log.error("骑手{}，网络异常!!!!!!", riderId, e);
+            log.error("师傅{}，网络异常!!!!!!", riderId, e);
         }
     }
 
@@ -69,7 +69,7 @@ public class RiderWebSocketServer {
             webSocketMap.remove(riderId);
             subOnlineCount();
         }
-        log.info("骑手{}断开WebSocket连接！当前在线人数为：{}", riderId, getOnlineCount());
+        log.info("师傅{}断开WebSocket连接！当前在线人数为：{}", riderId, getOnlineCount());
     }
 
     /**
@@ -79,7 +79,7 @@ public class RiderWebSocketServer {
      */
     @OnMessage
     public void onMessage(String message, Session session) {
-        log.info("收到来自骑手{}的信息：{}", riderId, message);
+        log.info("收到来自师傅{}的信息：{}", riderId, message);
         
         // 可以处理心跳消息或其他业务消息
         if ("ping".equals(message)) {
@@ -96,7 +96,7 @@ public class RiderWebSocketServer {
      */
     @OnError
     public void onError(Session session, Throwable error) {
-        log.error("骑手{}的WebSocket发生错误", riderId, error);
+        log.error("师傅{}的WebSocket发生错误", riderId, error);
     }
 
     /**
@@ -110,12 +110,12 @@ public class RiderWebSocketServer {
      * 发送自定义消息
      */
     public static void sendInfo(String message, @PathParam("riderId") String riderId) throws IOException {
-        log.info("发送消息到骑手{}，报文：{}", riderId, message);
+        log.info("发送消息到师傅{}，报文：{}", riderId, message);
         
         if (StrUtil.isNotBlank(riderId) && webSocketMap.containsKey(riderId)) {
             webSocketMap.get(riderId).sendMessage(message);
         } else {
-            log.error("骑手{}不在线！", riderId);
+            log.error("师傅{}不在线！", riderId);
         }
     }
 
@@ -127,12 +127,12 @@ public class RiderWebSocketServer {
             if (StrUtil.isNotBlank(riderId) && webSocketMap.containsKey(riderId)) {
                 String jsonMessage = JSONUtil.toJsonStr(orderData);
                 webSocketMap.get(riderId).sendMessage(jsonMessage);
-                log.info("成功发送订单通知给骑手：{}", riderId);
+                log.info("成功发送订单通知给师傅：{}", riderId);
             } else {
-                log.warn("骑手{}不在线，无法发送订单通知", riderId);
+                log.warn("师傅{}不在线，无法发送订单通知", riderId);
             }
         } catch (IOException e) {
-            log.error("发送订单通知给骑手{}失败", riderId, e);
+            log.error("发送订单通知给师傅{}失败", riderId, e);
         }
     }
 
@@ -144,7 +144,7 @@ public class RiderWebSocketServer {
             try {
                 webSocketMap.get(key).sendMessage(message);
             } catch (IOException e) {
-                log.error("广播消息给骑手{}失败", key, e);
+                log.error("广播消息给师傅{}失败", key, e);
             }
         }
     }

kxmall-rider-api/src/main/java/com/kxmall/web/controller/websocket/service/impl/RiderNotificationServiceImpl.java

@@ -27,7 +27,7 @@ public class RiderNotificationServiceImpl implements RiderNotificationService {
     @Override
     public void sendNewOrderNotification(SmartDispatchParamBo dispatchParam, List<KxRiderVo> recommendedRiders) {
         if (dispatchParam == null || CollUtil.isEmpty(recommendedRiders)) {
-            log.warn("派单参数或推荐骑手列表为空，无法发送通知");
+            log.warn("派单参数或推荐师傅列表为空，无法发送通知");
             return;
         }
 
@@ -41,7 +41,7 @@ public class RiderNotificationServiceImpl implements RiderNotificationService {
                 .collect(Collectors.toList());
 
         if (onlineRiders.isEmpty()) {
-            log.warn("订单{}没有找到在线的推荐骑手", dispatchParam.getOrderNo());
+            log.warn("订单{}没有找到在线的推荐师傅", dispatchParam.getOrderNo());
             return;
         }
 
@@ -51,28 +51,28 @@ public class RiderNotificationServiceImpl implements RiderNotificationService {
             sendOrderNotification(String.valueOf(rider.getId()), notification);
         }
 
-        log.info("订单{}成功发送通知给{}个在线骑手", dispatchParam.getOrderNo(), onlineRiders.size());
+        log.info("订单{}成功发送通知给{}个在线师傅", dispatchParam.getOrderNo(), onlineRiders.size());
     }
 
     @Override
     public void sendOrderNotification(String riderId, OrderNotificationDTO notification) {
         if (StrUtil.isBlank(riderId) || notification == null) {
-            log.warn("骑手ID或通知内容为空");
+            log.warn("师傅ID或通知内容为空");
             return;
         }
 
         try {
             RiderWebSocketServer.sendOrderNotification(riderId, notification);
-            log.debug("成功发送通知给骑手：{}", riderId);
+            log.debug("成功发送通知给师傅：{}", riderId);
         } catch (Exception e) {
-            log.error("发送通知给骑手{}失败", riderId, e);
+            log.error("发送通知给师傅{}失败", riderId, e);
         }
     }
 
     @Override
     public void sendOrderCancelNotification(String orderNo, String riderId) {
         if (StrUtil.isBlank(orderNo) || StrUtil.isBlank(riderId)) {
-            log.warn("订单号或骑手ID为空");
+            log.warn("订单号或师傅ID为空");
             return;
         }
 
@@ -83,7 +83,7 @@ public class RiderNotificationServiceImpl implements RiderNotificationService {
         notification.setRemark("订单已取消");
 
         sendOrderNotification(riderId, notification);
-        log.info("发送订单{}取消通知给骑手{}", orderNo, riderId);
+        log.info("发送订单{}取消通知给师傅{}", orderNo, riderId);
     }
 
     @Override

kxmall-rider-api/src/main/java/com/kxmall/web/controller/withdrawal/service/impl/KxRiderWithdrawalServiceImpl.java

@@ -30,7 +30,7 @@ public class KxRiderWithdrawalServiceImpl extends ServiceImpl<KxRiderWithdrawalM
         // 检查骑手是否存在
         KxRider rider = riderMapper.selectById(riderId);
         if (rider == null) {
-            throw new ServiceException("骑手不存在");
+            throw new ServiceException("师傅不存在");
         }
 
         // 检查余额是否足够

kxmall-system/src/main/java/com/kxmall/notify/service/impl/mock/MockAdminNotifyBizServiceImpl.java

@@ -31,6 +31,6 @@ public class MockAdminNotifyBizServiceImpl implements AdminNotifyBizService {
 
     @Override
     public void newRiderOrder(OrderMessageBO orderMessageBO) {
-        logger.info("[mock通知 有新骑手订单] 请及时处理：" + JSONObject.toJSONString(orderMessageBO));
+        logger.info("[mock通知 有新师傅订单] 请及时处理：" + JSONObject.toJSONString(orderMessageBO));
     }
 }

kxmall-system/src/main/java/com/kxmall/notify/service/impl/mock/MockMemberNotifyBizServiceImpl.java

@@ -36,6 +36,6 @@ public class MockMemberNotifyBizServiceImpl implements MemberNotifyBizService {
 
     @Override
     public void deliveryOrder(KxStoreOrderVo orderVo, DeliveryResult result) {
-        logger.info("[mock通知 第三方骑手已接单] 订单通知：" + JSONObject.toJSONString(orderVo));
+        logger.info("[mock通知 第三方师傅已接单] 订单通知：" + JSONObject.toJSONString(orderVo));
     }
 }

kxmall-system/src/main/java/com/kxmall/order/biz/OrderRiderBizService.java

@@ -84,7 +84,7 @@ public class OrderRiderBizService {
                 boolean isLocked = lock.tryLock(RIDER_ORDER_LOCK_WAITING_TIME, TimeUnit.SECONDS);
                 if (isLocked) {
                     if (StrUtil.isEmpty(orderNo)) {
-                        throw new ServiceException("配送订单信息缺少");
+                        throw new ServiceException("服务订单信息缺少");
                     }
                     // 检查订单是否已经被分配过，如果已经分配，这个改变已分配的状态为‘已经被更改配送’
                     QueryWrapper<KxRiderOrder> wrapper = new QueryWrapper<>();
@@ -108,11 +108,11 @@ public class OrderRiderBizService {
                         return persistenceOrderRiderMessage(orderMessageBO);
                     }
                 } else {
-                    throw new ServiceException("配送订单系统繁忙~");
+                    throw new ServiceException("服务订单系统繁忙~");
                 }
             } catch (Exception e) {
-                logger.error("[配送订单信息] 异常", e);
-                throw new ServiceException("配送订单系统未知异常");
+                logger.error("[服务订单信息] 异常", e);
+                throw new ServiceException("服务订单系统未知异常");
             } finally {
                 lock.unlock();
             }
@@ -147,7 +147,7 @@ public class OrderRiderBizService {
             this.sendRiderOrder(orderMessageBO);
             return true;
         }
-        throw new ServiceException("配送订单消息保存失败");
+        throw new ServiceException("服务订单消息保存失败");
     }
 
     /**
@@ -209,12 +209,12 @@ public class OrderRiderBizService {
                         GlobalExecutor.execute(() -> memberNotifyBizService.completeOrder(storeOrder));
                         break;
                     default:
-                        throw new ServiceException("配送订单消息保存失败");
+                        throw new ServiceException("服务订单消息保存失败");
                 }
             }
         } catch (Exception e) {
             logger.warn(e.getMessage(), e);
         }
-        logger.info("【*** 订单配送消息结束,状态：{} ***】", (riderMessageBO != null) ? "success" : "fail");
+        logger.info("【*** 订单服务消息结束,状态：{} ***】", (riderMessageBO != null) ? "success" : "fail");
     }
 }

kxmall-system/src/main/java/com/kxmall/order/biz/dada/domain/DadaStatusConverter.java

@@ -27,14 +27,14 @@ public class DadaStatusConverter {
 
     public String getStatusDescription(Integer dadaStatus) {
         switch (dadaStatus) {
-            case 1: return "等待骑手接单";
-            case 2: return "骑手已接单";
-            case 3: return "骑手已取货";
-            case 4: return "配送已完成";
+            case 1: return "等待师傅接单";
+            case 2: return "师傅已接单";
+            case 3: return "师傅已取货";
+            case 4: return "服务已完成";
             case 5: return "订单已取消";
             case 7: return "订单已过期";
             case 8: return "系统指派中";
-            case 9: return "配送异常";
+            case 9: return "服务异常";
             default: return "未知状态";
         }
     }

kxmall-system/src/main/java/com/kxmall/order/domain/bo/KxDeliveryConfigBo.java

@@ -33,7 +33,7 @@ public class KxDeliveryConfigBo extends BaseEntity {
     /**
      * 配送类型(DD:达达 SF:顺丰 SELF:自配送)
      */
-    @NotBlank(message = "配送类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "服务类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String deliveryType;
 
     /**
@@ -43,7 +43,7 @@ public class KxDeliveryConfigBo extends BaseEntity {
     private String configJson;
 
     /**
-     * 是否默认配送方式(0否 1是)
+     * 是否默认服务方式(0否 1是)
      */
     @NotNull(message = "是否默认不能为空", groups = { AddGroup.class, EditGroup.class })
     private Boolean isDefault;

kxmall-system/src/main/java/com/kxmall/order/domain/vo/KxStoreOrderVo.java

@@ -319,7 +319,7 @@ public class KxStoreOrderVo implements Serializable {
     /**
      * 配送方式 1=配送 ，2=门店自提
      */
-    @ExcelProperty(value = "配送方式 1=配送 ，2=门店自提")
+    @ExcelProperty(value = "服务方式 1=服务 ，2=门店自提")
     private Integer shippingType;
 
     /**

kxmall-system/src/main/java/com/kxmall/rider/domain/bo/KxRiderBo.java

@@ -28,7 +28,7 @@ public class KxRiderBo extends BaseEntity {
     /**
      * 配送员主键ID
      */
-    @NotNull(message = "配送员主键ID不能为空", groups = { EditGroup.class })
+    @NotNull(message = "师傅主键ID不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**

kxmall-system/src/main/java/com/kxmall/rider/domain/bo/KxRiderOrderBo.java

@@ -25,7 +25,7 @@ public class  KxRiderOrderBo extends BaseEntity {
     /**
      * 配送员订单主键ID
      */
-    @NotNull(message = "配送员订单主键ID不能为空", groups = { EditGroup.class })
+    @NotNull(message = "师傅订单主键ID不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**

kxmall-system/src/main/java/com/kxmall/rider/domain/vo/KxRiderCycleVo.java

@@ -22,13 +22,13 @@ public class KxRiderCycleVo {
     /**
      * 配送周期主键ID
      */
-    @ExcelProperty(value = "配送周期主键ID")
+    @ExcelProperty(value = "服务周期主键ID")
     private Long id;
 
     /**
      * 配送员主键ID
      */
-    @ExcelProperty(value = "配送员主键ID")
+    @ExcelProperty(value = "师傅主键ID")
     private Long riderId;
 
     /**

kxmall-system/src/main/java/com/kxmall/rider/domain/vo/KxRiderItemVo.java

@@ -30,7 +30,7 @@ public class KxRiderItemVo {
     /**
      * 配送单主键
      */
-    @ExcelProperty(value = "配送单主键")
+    @ExcelProperty(value = "服务单主键")
     private Long riderOrderId;
 
     /**

kxmall-system/src/main/java/com/kxmall/rider/domain/vo/KxRiderOrderVo.java

@@ -1,16 +1,15 @@
 package com.kxmall.rider.domain.vo;
 
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.kxmall.common.annotation.ExcelDictFormat;
 import com.kxmall.common.convert.ExcelDictConvert;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
 
 /**
  * 配送员订单信息视图对象 kx_rider_order
@@ -27,25 +26,25 @@ public class KxRiderOrderVo {
     /**
      * 配送员订单主键ID
      */
-    @ExcelProperty(value = "配送员订单主键ID")
+    @ExcelProperty(value = "师傅订单主键ID")
     private Long id;
 
     /**
      * 配送状态
      */
-    @ExcelProperty(value = "配送状态")
+    @ExcelProperty(value = "服务状态")
     private Integer status;
 
     /**
      * 配送订单异常原因
      */
-    @ExcelProperty(value = "配送订单异常原因")
+    @ExcelProperty(value = "服务订单异常原因")
     private String reason;
 
     /**
      * 配送员主键
      */
-    @ExcelProperty(value = "配送员主键")
+    @ExcelProperty(value = "师傅主键")
     private Long riderId;
 
     /**

kxmall-system/src/main/java/com/kxmall/rider/domain/vo/KxRiderVo.java

@@ -26,25 +26,25 @@ public class KxRiderVo implements Serializable {
     /**
      * 配送员主键ID
      */
-    @ExcelProperty(value = "配送员主键ID")
+    @ExcelProperty(value = "师傅主键ID")
     private Long id;
 
     /**
      * 配送员名字
      */
-    @ExcelProperty(value = "配送员名字")
+    @ExcelProperty(value = "师傅名字")
     private String name;
 
     /**
      * 开始配送时间
      */
-    @ExcelProperty(value = "开始配送时间")
+    @ExcelProperty(value = "开始服务时间")
     private String deliveryStart;
 
     /**
      * 结束配送时间
      */
-    @ExcelProperty(value = "结束配送时间")
+    @ExcelProperty(value = "结束服务时间")
     private String deliveryEnd;
 
     /**
@@ -86,7 +86,7 @@ public class KxRiderVo implements Serializable {
     /**
      * 配送员状态
      */
-    @ExcelProperty(value = "配送员状态")
+    @ExcelProperty(value = "师傅状态")
     private Integer state;
 
     /**
@@ -98,7 +98,7 @@ public class KxRiderVo implements Serializable {
     /**
      * 骑手登录密码
      */
-    @ExcelProperty(value = "骑手登录密码")
+    @ExcelProperty(value = "师傅登录密码")
     private String password;
 
     /**
@@ -110,7 +110,7 @@ public class KxRiderVo implements Serializable {
     /**
      * 配送范围
      */
-    @ExcelProperty(value = "配送范围")
+    @ExcelProperty(value = "服务范围")
     private BigDecimal workRadio;
 
     private Date createTime;
@@ -144,7 +144,7 @@ public class KxRiderVo implements Serializable {
     /**
      * 骑手等级
      */
-    @ExcelProperty(value = "骑手等级")
+    @ExcelProperty(value = "师傅等级")
     private Byte level;
 
     /**

kxmall-system/src/main/java/com/kxmall/storage/domain/vo/KxStorageVo.java

@@ -118,7 +118,7 @@ public class KxStorageVo {
     /**
      * 配送起始时间
      */
-    @ExcelProperty(value = "配送起始时间")
+    @ExcelProperty(value = "服务起始时间")
     private String deliveryStartTime;
 
     /**
@@ -130,13 +130,13 @@ public class KxStorageVo {
     /**
      * 配送结束时间
      */
-    @ExcelProperty(value = "配送结束时间")
+    @ExcelProperty(value = "服务结束时间")
     private String deliveryStopTime;
 
     /**
      * 配送范围
      */
-    @ExcelProperty(value = "配送范围")
+    @ExcelProperty(value = "服务范围")
     private Long deliveryRadius;
 
     /**

kxmall-system/src/main/java/com/kxmall/system/domain/bo/SysRegionInfoBo.java

@@ -14,7 +14,7 @@ import java.util.List;
 @ToString
 public class SysRegionInfoBo {
 
-    @NotBlank(message = "请填写可配送区域")
+    @NotBlank(message = "请填写可服务区域")
     private String regionName;
 
     @NotBlank(message = "请填写首件")

kxmall-system/src/main/java/com/kxmall/wechat/handler/ScanHandler.java

@@ -61,7 +61,7 @@ public class ScanHandler extends AbstractHandler {
             update.setGzhOpenId(openId);
             // 扫码事件处理
             if (riderMapper.updateById(update)<=0) {
-                return new TextBuilder().build("骑手订阅失败！", wxMpXmlMessage, wxMpService);
+                return new TextBuilder().build("师傅订阅失败！", wxMpXmlMessage, wxMpService);
             }
         }
         return new TextBuilder().build("订阅成功！", wxMpXmlMessage, wxMpService);