Merge branch 'hurx'

ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/utils/SequenceUtils.java

@@ -188,7 +188,8 @@ public class SequenceUtils {
         // 明确指定 bean name 为 "redisTemplate"
         RedisTemplate<String, Object> redisTemplate = SpringUtils.getBean("redisTemplate", RedisTemplate.class);
 
-        String dateKey = DateUtil.format(new Date(), DatePattern.PURE_DATE_PATTERN); // 如 "yyyyMMdd"
+        // 使用 yyMMdd 格式而不是 yyyyMMdd，使年份变为2位
+        String dateKey = DateUtil.format(new Date(), "yyMMdd"); // 如 "260511"
         String businessKey = prefix + dateKey;
 
         Long seq = redisTemplate.opsForValue().increment(businessKey);

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/controller/OrderMainController.java

@@ -132,7 +132,7 @@ public class OrderMainController extends BaseController {
     @Log(title = "订单主信息", businessType = BusinessType.INSERT)
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody OrderMainBo bo) {
-        bo.setOrderNoPrefix("Mo");
+        bo.setOrderNoPrefix("MO");
         orderMainService.insertByBo(bo); // 成功则继续，失败则抛异常
         return R.ok();
     }

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/dubbo/RemoteExternalOrderServiceImpl.java

@@ -358,7 +358,7 @@ public class RemoteExternalOrderServiceImpl implements RemoteExternalOrderServic
     public OrderNoDto createZhongCheOrder(OrderDetailVo orderDetailVo) {
         OrderMain orderMain = new OrderMain();
         //4、电商系统订单号
-        String orderNo = SequenceUtils.generateOrderCode("RS");
+        String orderNo = SequenceUtils.generateOrderCode("PO");
         orderMain.setOrderNo(orderNo);
         //5、订单状态
         orderMain.setOrderStatus("1");

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/service/impl/OrderMainServiceImpl.java

@@ -643,7 +643,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             mainBo.setCustomerService(staffMap.get(serviceStaffId));
             mainBo.setBusinessDept(deptMap.get(belongingDepartmentId));
         }
-        mainBo.setOrderNoPrefix("Mo");
+        mainBo.setOrderNoPrefix("MO");
         // 1. 插入主订单，获取生成的 ID
         Long orderId = this.insertByBo(mainBo);
         // 2. 校验插入是否成功
@@ -1354,7 +1354,7 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
 
             mainBo.setOrderStatuses(OrderSourceEnum.Api_ADD.getCode());
 
-            mainBo.setOrderNoPrefix("Po");
+            mainBo.setOrderNoPrefix("PO");
 
 
             // 处理商品信息