Merge branch 'hurx'

# Conflicts:
#	ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/SupplierAuthorizeServiceImpl.java

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/InvoiceStatus.java

@@ -0,0 +1,23 @@
+package org.dromara.common.core.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum InvoiceStatus {
+
+    /**
+     * 未开票
+     */
+    NOT_INVOICED("0", "未开票"),
+
+    /**
+     * 已开票
+     */
+    INVOICED("1", "已开票");
+
+
+    private final String code;
+    private final String info;
+}

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/StatementStatus.java

@@ -0,0 +1,39 @@
+package org.dromara.common.core.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum StatementStatus {
+
+    /**
+     * 待确认
+     */
+    PENDING_CONFIRMATION("0", "待确认"),
+
+    /**
+     * 待对账
+     */
+    PENDING_RECONCILIATION("1", "待对账"),
+
+    /**
+     * 已对账
+     */
+    RECONCILED("2", "已对账"),
+
+    /**
+     * 驳回
+     */
+    REJECTED("3", "驳回"),
+
+    /**
+     * 作废
+     */
+    CANCELLED("4", "作废");
+
+
+    private final String code;
+    private final String info;
+
+}

ruoyi-modules/ruoyi-bill/src/main/java/org/dromara/bill/service/impl/StatementInvoiceServiceImpl.java

@@ -224,12 +224,16 @@ public class StatementInvoiceServiceImpl extends ServiceImpl<StatementInvoiceMap
     }
 
     /**
-     * 公共方法：删除明细和商品
+     * 公共方法：删除明细,商品和发票明细
      */
     private void deleteDetailsAndProductsAndInvoiceInfos(Long statementInvoiceId) {
+
         statementInvoiceDetailMapper.deleteByStatementInvoiceId(statementInvoiceId);
+
         statementInvoiceProductMapper.deleteByStatementInvoiceId(statementInvoiceId);
+
         invoiceInfoMapper.deleteByStatementInvoiceId(statementInvoiceId);
+
     }
 
     /**

ruoyi-modules/ruoyi-bill/src/main/java/org/dromara/bill/service/impl/StatementOrderServiceImpl.java

@@ -22,6 +22,7 @@ import org.dromara.bill.mapper.StatementDetailMapper;
 import org.dromara.bill.mapper.StatementOrderMapper;
 import org.dromara.bill.mapper.StatementProductMapper;
 import org.dromara.bill.service.IStatementOrderService;
+import org.dromara.common.core.enums.InvoiceStatus;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -127,7 +128,7 @@ public class StatementOrderServiceImpl extends ServiceImpl<StatementOrderMapper,
 
         // 查询客户的所有有效对账单
         LambdaQueryWrapper<StatementOrder> orderWrapper = new LambdaQueryWrapper<>();
-        orderWrapper.eq(StatementOrder::getCustomerId, customerId)
+        orderWrapper.eq(StatementOrder::getCustomerId, customerId).ne(StatementOrder::getIsInvoiceStatus, InvoiceStatus.INVOICED.getCode())
             .eq(StatementOrder::getDelFlag, "0");
 
         List<StatementOrder> statementOrders = baseMapper.selectList(orderWrapper);

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/CustomerContact.java

@@ -66,8 +66,12 @@ public class CustomerContact extends TenantEntity {
      */
     private Long roleId;
 
+    private String roleName;
+
     private Long deptId;
 
+    private String deptName;
+
     private String email;
 
     private Date birthday;

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/bo/CustomerContactBo.java

@@ -35,13 +35,13 @@ public class CustomerContactBo extends BaseEntity {
     /**
      * 联系人姓名
      */
-    @NotBlank(message = "联系人姓名不能为空", groups = {AddGroup.class, EditGroup.class})
+//    @NotBlank(message = "联系人姓名不能为空", groups = {AddGroup.class, EditGroup.class})
     private String contactName;
 
     /**
      * 手机号码
      */
-    @NotBlank(message = "手机号码不能为空", groups = {AddGroup.class, EditGroup.class})
+//    @NotBlank(message = "手机号码不能为空", groups = {AddGroup.class, EditGroup.class})
     private String phone;
 
     /**
@@ -67,8 +67,12 @@ public class CustomerContactBo extends BaseEntity {
      */
     private Long roleId;
 
+    private String roleName;
+
     private Long deptId;
 
+    private String deptName;
+
     private String email;
 
     private Date birthday;

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/domain/vo/CustomerContactVo.java

@@ -40,7 +40,6 @@ public class CustomerContactVo implements Serializable {
     private Long customerId;
 
 
-
     /**
      * 联系人姓名
      */
@@ -79,11 +78,14 @@ public class CustomerContactVo implements Serializable {
      * 采购角色（如：采购经理、财务）
      */
     @ExcelProperty(value = "采购角色", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "如=：采购经理、财务")
     private Long roleId;
 
+    private String roleName;
+
     private Long deptId;
 
+    private String deptName;
+
     /**
      * 是否主联系人：0=是，1=否
      */

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/CustomerInfoServiceImpl.java

@@ -1,6 +1,7 @@
 package org.dromara.customer.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.crypto.digest.BCrypt;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -15,12 +16,14 @@ import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.customer.domain.*;
 import org.dromara.customer.domain.bo.*;
 import org.dromara.customer.domain.vo.*;
 import org.dromara.customer.mapper.*;
 import org.dromara.customer.service.ICustomerInfoService;
 import org.dromara.system.api.*;
+import org.dromara.system.api.domain.bo.RemoteUserBo;
 import org.dromara.system.api.domain.vo.RemoteDeptVo;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -43,6 +46,8 @@ public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, Cus
     @DubboReference
     private RemoteDeptService remoteDeptService;
     @DubboReference
+    private RemoteUserService remoteUserService;
+    @DubboReference
     private RemoteComPostService remoteComPostService;
     @DubboReference
     private RemoteComStaffService remoteComStaffService;
@@ -593,6 +598,23 @@ public class CustomerInfoServiceImpl extends ServiceImpl<CustomerInfoMapper, Cus
 
             // 联系人列表
             if (contactList != null && !contactList.isEmpty()) {
+                CustomerContactBo primaryContact = contactList.stream()
+                    .filter(contact -> contact.getIsPrimary().equals("0"))
+                    .findFirst()
+                    .orElse(null);
+                RemoteUserBo remoteUserBo = new RemoteUserBo();
+                remoteUserBo.setNickName(bo.getCustomerName());
+                if (null != primaryContact) {
+                    remoteUserBo.setUserName(primaryContact.getPhone());
+                } else {
+                    remoteUserBo.setUserName(contactList.get(0).getPhone());
+                }
+
+                String password = "123456";
+                remoteUserBo.setPassword(BCrypt.hashpw(password));
+                remoteUserBo.setUserSonType("3");
+                remoteUserBo.setTenantId(LoginHelper.getTenantId());
+                remoteUserService.addUser(remoteUserBo);
                 for (CustomerContactBo contactBo : contactList) {
                     CustomerContact contact = MapstructUtils.convert(contactBo, CustomerContact.class);
                     contact.setCustomerId(customerId);

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

@@ -143,6 +143,18 @@ public class OrderMainController extends BaseController {
         return toAjax(orderMainService.deleteWithValidByIds(List.of(ids), true));
     }
 
+    /**
+     * 关闭订单
+     *
+     * @param ids 主键串
+     */
+    @Log(title = "订单主信息", businessType = BusinessType.UPDATE)
+    @PostMapping("closeOrder")
+    public R<Void> closeOrder(@NotEmpty(message = "主键不能为空")
+                              @RequestParam Long[] ids) {
+        return toAjax(orderMainService.closeOrderByIds(List.of(ids), true));
+    }
+
     /**
      * 状态修改
      */

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

@@ -0,0 +1,106 @@
+package org.dromara.order.controller;
+
+import java.util.List;
+
+import lombok.RequiredArgsConstructor;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.*;
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.validation.annotation.Validated;
+import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.web.core.BaseController;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.order.domain.vo.OrderOperateLogVo;
+import org.dromara.order.domain.bo.OrderOperateLogBo;
+import org.dromara.order.service.IOrderOperateLogService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 订单操作记录
+ * 前端访问路由地址为:/order/orderOperateLog
+ *
+ * @author LionLi
+ * @date 2026-01-26
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/orderOperateLog")
+public class OrderOperateLogController extends BaseController {
+
+    private final IOrderOperateLogService orderOperateLogService;
+
+    /**
+     * 查询订单操作记录列表
+     */
+    //@SaCheckPermission("order:orderOperateLog:list")
+    @GetMapping("/list")
+    public TableDataInfo<OrderOperateLogVo> list(OrderOperateLogBo bo, PageQuery pageQuery) {
+        return orderOperateLogService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出订单操作记录列表
+     */
+    //@SaCheckPermission("order:orderOperateLog:export")
+    @Log(title = "订单操作记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(OrderOperateLogBo bo, HttpServletResponse response) {
+        List<OrderOperateLogVo> list = orderOperateLogService.queryList(bo);
+        ExcelUtil.exportExcel(list, "订单操作记录", OrderOperateLogVo.class, response);
+    }
+
+    /**
+     * 获取订单操作记录详细信息
+     *
+     * @param id 主键
+     */
+    //@SaCheckPermission("order:orderOperateLog:query")
+    @GetMapping("/{id}")
+    public R<OrderOperateLogVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable("id") Long id) {
+        return R.ok(orderOperateLogService.queryById(id));
+    }
+
+    /**
+     * 新增订单操作记录
+     */
+    //@SaCheckPermission("order:orderOperateLog:add")
+    @Log(title = "订单操作记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody OrderOperateLogBo bo) {
+        return toAjax(orderOperateLogService.insertByBo(bo));
+    }
+
+    /**
+     * 修改订单操作记录
+     */
+    //@SaCheckPermission("order:orderOperateLog:edit")
+    @Log(title = "订单操作记录", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody OrderOperateLogBo bo) {
+        return toAjax(orderOperateLogService.updateByBo(bo));
+    }
+
+    /**
+     * 删除订单操作记录
+     *
+     * @param ids 主键串
+     */
+    //@SaCheckPermission("order:orderOperateLog:remove")
+    @Log(title = "订单操作记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable("ids") Long[] ids) {
+        return toAjax(orderOperateLogService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/OrderOperateLog.java

@@ -0,0 +1,57 @@
+package org.dromara.order.domain;
+
+import org.dromara.common.tenant.core.TenantEntity;
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serial;
+
+/**
+ * 订单操作记录对象 order_operate_log
+ *
+ * @author LionLi
+ * @date 2026-01-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("order_operate_log")
+public class OrderOperateLog extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+    /**
+     * 操作
+     */
+    private String action;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
+     * 删除标志（0代表存在 2代表删除）
+     */
+    @TableLogic
+    private String delFlag;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/OrderProduct.java

@@ -41,6 +41,12 @@ public class OrderProduct extends TenantEntity {
      */
     private Long orderId;
 
+    /*原始商品ID（用于子订单商品指向主订单）*/
+    private Long originalItemId;
+
+    /*被分配到的子订单ID*/
+    private Long assignedChildOrderId;
+
     /**
      * 订单编号
      */

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/bo/OrderOperateLogBo.java

@@ -0,0 +1,49 @@
+package org.dromara.order.domain.bo;
+
+import org.dromara.order.domain.OrderOperateLog;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import jakarta.validation.constraints.*;
+
+/**
+ * 订单操作记录业务对象 order_operate_log
+ *
+ * @author LionLi
+ * @date 2026-01-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = OrderOperateLog.class, reverseConvertGenerate = false)
+public class OrderOperateLogBo extends BaseEntity {
+
+    /**
+     * ID
+     */
+    private Long id;
+
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
+    /**
+     * 操作
+     */
+    private String action;
+
+    /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/bo/OrderProductBo.java

@@ -40,6 +40,12 @@ public class OrderProductBo extends BaseEntity {
     @NotNull(message = "订单ID不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long orderId;
 
+    /*原始商品ID（用于子订单商品指向主订单）*/
+    private Long originalItemId;
+
+    /*被分配到的子订单ID*/
+    private Long assignedChildOrderId;
+
     /**
      * 订单编号
      */

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/dto/AssignmentStatsDto.java

@@ -0,0 +1,12 @@
+package org.dromara.order.domain.dto;
+
+import lombok.Data;
+
+@Data
+public class AssignmentStatsDto {
+
+    private Long total;
+
+    private Long assigned;
+
+}

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/vo/OrderOperateLogVo.java

@@ -0,0 +1,62 @@
+package org.dromara.order.domain.vo;
+
+import org.dromara.order.domain.OrderOperateLog;
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import org.dromara.common.excel.annotation.ExcelDictFormat;
+import org.dromara.common.excel.convert.ExcelDictConvert;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+
+
+/**
+ * 订单操作记录视图对象 order_operate_log
+ *
+ * @author LionLi
+ * @date 2026-01-26
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = OrderOperateLog.class)
+public class OrderOperateLogVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ExcelProperty(value = "ID")
+    private Long id;
+
+    /**
+     * 订单id
+     */
+    @ExcelProperty(value = "订单id")
+    private Long orderId;
+
+    /**
+     * 操作
+     */
+    @ExcelProperty(value = "操作")
+    private String action;
+
+    /**
+     * 用户名
+     */
+    @ExcelProperty(value = "用户名")
+    private String userName;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+
+}

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/domain/vo/OrderProductVo.java

@@ -47,6 +47,12 @@ public class OrderProductVo implements Serializable {
     @ExcelProperty(value = "订单ID")
     private Long orderId;
 
+    /*原始商品ID（用于子订单商品指向主订单）*/
+    private Long originalItemId;
+
+    /*被分配到的子订单ID*/
+    private Long assignedChildOrderId;
+
     /**
      * 订单编号
      */

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/mapper/OrderOperateLogMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.order.mapper;
+
+import org.dromara.order.domain.OrderOperateLog;
+import org.dromara.order.domain.vo.OrderOperateLogVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 订单操作记录Mapper接口
+ *
+ * @author LionLi
+ * @date 2026-01-26
+ */
+public interface OrderOperateLogMapper extends BaseMapperPlus<OrderOperateLog, OrderOperateLogVo> {
+
+}

ruoyi-modules/ruoyi-order/src/main/java/org/dromara/order/mapper/OrderProductMapper.java

@@ -1,11 +1,14 @@
 package org.dromara.order.mapper;
 
 import org.apache.ibatis.annotations.Param;
+import org.dromara.common.core.enums.OrderAssignStatus;
 import org.dromara.order.domain.OrderProduct;
+import org.dromara.order.domain.dto.AssignmentStatsDto;
 import org.dromara.order.domain.vo.OrderProductVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.order.domain.vo.OrderQuantitySummary;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -36,5 +39,20 @@ public interface OrderProductMapper extends BaseMapperPlus<OrderProduct, OrderPr
 
 
     /*查询  订单商品种数与已分配商品种数*/
-    Map getAssignmentStats(@Param("orderId") Long orderId);
+    AssignmentStatsDto getAssignmentStats(@Param("parentId") Long parentId);
+
+    /**
+     * 批量更新商品的分配状态和关联的子订单ID
+     *
+     * @param itemIds          要更新的商品ID列表
+     * @param assignmentStatus 分配状态（如 "1" 表示已分配）
+     * @param childOrderId     被分配到的子订单ID
+     * @param updateTime       更新时间
+     */
+    void updateAssignmentInfo(
+        @Param("itemIds") List<Long> itemIds,
+        @Param("assignmentStatus") String assignmentStatus,
+        @Param("childOrderId") Long childOrderId,
+        @Param("updateTime") Date updateTime
+    );
 }

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

@@ -86,4 +86,6 @@ public interface IOrderMainService extends IService<OrderMain> {
      * @return 是否删除成功
      */
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    Boolean closeOrderByIds(Collection<Long> ids, Boolean isValid);
 }

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

@@ -0,0 +1,70 @@
+package org.dromara.order.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import org.dromara.order.domain.OrderOperateLog;
+import org.dromara.order.domain.vo.OrderOperateLogVo;
+import org.dromara.order.domain.bo.OrderOperateLogBo;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 订单操作记录Service接口
+ *
+ * @author LionLi
+ * @date 2026-01-26
+ */
+public interface IOrderOperateLogService extends IService<OrderOperateLog>{
+
+    /**
+     * 查询订单操作记录
+     *
+     * @param id 主键
+     * @return 订单操作记录
+     */
+    OrderOperateLogVo queryById(Long id);
+
+    /**
+     * 分页查询订单操作记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 订单操作记录分页列表
+     */
+    TableDataInfo<OrderOperateLogVo> queryPageList(OrderOperateLogBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的订单操作记录列表
+     *
+     * @param bo 查询条件
+     * @return 订单操作记录列表
+     */
+    List<OrderOperateLogVo> queryList(OrderOperateLogBo bo);
+
+    /**
+     * 新增订单操作记录
+     *
+     * @param bo 订单操作记录
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(OrderOperateLogBo bo);
+
+    /**
+     * 修改订单操作记录
+     *
+     * @param bo 订单操作记录
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(OrderOperateLogBo bo);
+
+    /**
+     * 校验并批量删除订单操作记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

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

@@ -26,6 +26,7 @@ import org.dromara.order.domain.OrderProduct;
 import org.dromara.order.domain.OrderProductAssignRule;
 import org.dromara.order.domain.bo.OrderAssignmentBo;
 import org.dromara.order.domain.bo.OrderSplitAssignBo;
+import org.dromara.order.domain.dto.AssignmentStatsDto;
 import org.dromara.order.domain.vo.OrderAssignmentVo;
 import org.dromara.order.domain.vo.OrderMainVo;
 import org.dromara.order.mapper.OrderAssignmentMapper;
@@ -35,6 +36,7 @@ import org.dromara.order.service.IOrderAssignmentService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.time.Duration;
 import java.util.*;
 import java.util.function.Function;
@@ -208,11 +210,11 @@ public class OrderAssignmentServiceImpl extends ServiceImpl<OrderAssignmentMappe
         if (parentOrder == null) {
             throw new ServiceException("父订单不存在");
         }
-        if ("1".equals(parentOrder.getSplitStatus())) { // 已拆分
+      /*  if (OrderSplitStatus.SPLITED.getCode().equals(parentOrder.getSplitStatus())) {
             throw new ServiceException("该订单已被拆分，不可重复操作");
-        }
+        }*/
 
-        // 2. 验证商品行
+        // 2. 验证商品行（必须属于该主订单且未分配）
         List<Long> itemIds = rules.stream().map(OrderProductAssignRule::getItemId).collect(Collectors.toList());
         List<OrderProduct> items = orderProductMapper.selectBatchIds(itemIds);
         Map<Long, OrderProduct> itemMap = items.stream()
@@ -223,12 +225,12 @@ public class OrderAssignmentServiceImpl extends ServiceImpl<OrderAssignmentMappe
             if (item == null || !parentId.equals(item.getOrderId())) {
                 throw new ServiceException("商品行不属于该订单或不存在");
             }
-            if ("1".equals(item.getAssignmentStatus())) { // 已分配
+            if (OrderAssignStatus.ASSIGNED.getCode().equals(item.getAssignmentStatus())) {
                 throw new ServiceException("商品 [" + item.getProductName() + "] 已分配，不可重复操作");
             }
-            // 校验 assigneeType 合法性
             String type = rule.getAssigneeType();
-            if (!AssigneeTypeConstants.SUPPLIER.getCode().equals(type) && !AssigneeTypeConstants.PARTNER.getCode().equals(type)) {
+            if (!AssigneeTypeConstants.SUPPLIER.getCode().equals(type) &&
+                !AssigneeTypeConstants.PARTNER.getCode().equals(type)) {
                 throw new ServiceException("分配对象类型不支持: " + type);
             }
         }
@@ -239,51 +241,118 @@ public class OrderAssignmentServiceImpl extends ServiceImpl<OrderAssignmentMappe
         Map<AssigneeKey, List<OrderProductAssignRule>> assigneeGroups = rules.stream()
             .collect(Collectors.groupingBy(rule -> new AssigneeKey(rule.getAssigneeId(), rule.getAssigneeType())));
 
-        // 4. 为每个分配对象创建子订单
+        // 4. 为每个分配对象创建子订单 + 商品副本
         for (Map.Entry<AssigneeKey, List<OrderProductAssignRule>> entry : assigneeGroups.entrySet()) {
             AssigneeKey key = entry.getKey();
             List<OrderProductAssignRule> groupRules = entry.getValue();
 
-            // 创建子订单
+            // 创建子订单（从主订单拷贝必要字段）
             OrderMain childOrder = copyParentToChild(parentOrder, key.id(), key.type());
             orderMainMapper.insert(childOrder);
+            Long childOrderId = childOrder.getId();
+
+            // 准备子订单商品列表（副本）
+            List<OrderProduct> childProducts = new ArrayList<>();
+            List<Long> parentItemIdsToUpdate = new ArrayList<>();
+
+            for (OrderProductAssignRule rule : groupRules) {
+                OrderProduct parentItem = itemMap.get(rule.getItemId());
+
+                // 1. 收集主订单商品ID，用于后续批量更新分配状态
+                parentItemIdsToUpdate.add(parentItem.getId());
+
+                // 2. 创建子订单商品副本
+                OrderProduct childProduct = new OrderProduct();
+
+                // 继承租户信息
+                childProduct.setTenantId(parentItem.getTenantId());
+
+                // 关联信息
+                childProduct.setOrderId(childOrderId);           // 归属子订单
+                childProduct.setOriginalItemId(parentItem.getId()); // 指向主订单商品
+
+                // 订单基础信息
+                childProduct.setOrderNo(childOrder.getOrderNo()); // 子订单编号
+                childProduct.setDataSource(parentItem.getDataSource());
+
+                // 商品核心信息
+                childProduct.setProductId(parentItem.getProductId());
+                childProduct.setProductNo(parentItem.getProductNo());
+                childProduct.setProductName(parentItem.getProductName());
+                childProduct.setProductUnitId(parentItem.getProductUnitId());
+                childProduct.setProductUnit(parentItem.getProductUnit());
+                childProduct.setProductImage(parentItem.getProductImage());
+
+                // 价格信息
+                childProduct.setPlatformPrice(parentItem.getPlatformPrice());
+                childProduct.setMarketPrice(parentItem.getMarketPrice());
+                childProduct.setMemberPrice(parentItem.getMemberPrice());
+                childProduct.setPurchasingPrice(parentItem.getPurchasingPrice());
+                childProduct.setMaxPurchasePrice(parentItem.getMaxPurchasePrice());
+                childProduct.setMinSellingPrice(parentItem.getMinSellingPrice());
+                childProduct.setTaxRate(parentItem.getTaxRate());
+                childProduct.setOrderPrice(parentItem.getOrderPrice());
+                childProduct.setSubtotal(parentItem.getSubtotal());
+
+                // 数量信息（注意：履约数量应重置）
+                childProduct.setOrderQuantity(parentItem.getOrderQuantity());
+                childProduct.setMinOrderQuantity(parentItem.getMinOrderQuantity());
+                childProduct.setUnsentQuantity(parentItem.getOrderQuantity()); // 未发货 = 总数
+                childProduct.setReturnAmount(BigDecimal.ZERO);
+
+                // 状态与标志
+                childProduct.setAssignmentStatus(OrderAssignStatus.ASSIGNED.getCode()); // 已分配
+
+                // 时间 & 其他
+                childProduct.setPreDeliveryDate(parentItem.getPreDeliveryDate());
+                childProduct.setRemark(parentItem.getRemark());
+
+                childProducts.add(childProduct);
+            }
 
-            // 更新商品：指向子订单 + 标记已分配
-            List<Long> groupItemIds = groupRules.stream().map(OrderProductAssignRule::getItemId).collect(Collectors.toList());
-            orderProductMapper.updateForSplitAssign(
-                groupItemIds,
-                childOrder.getId(),
-                OrderAssignStatus.ASSIGNED.getCode() // assignmentStatus = 已分配
-            );
+            // 批量插入子订单商品
+            if (!childProducts.isEmpty()) {
+                orderProductMapper.insertBatch(childProducts);
+            }
+
+            // 批量更新主订单商品：标记已分配 + 记录分配到的子订单ID
+            if (!parentItemIdsToUpdate.isEmpty()) {
+                orderProductMapper.updateAssignmentInfo(
+                    parentItemIdsToUpdate,
+                    OrderAssignStatus.ASSIGNED.getCode(),
+                    childOrderId,
+                    now
+                );
+            }
 
-            // 插入分配记录
+            // 插入分配记录（分配动作日志）
             OrderAssignment assignment = new OrderAssignment();
-            assignment.setOrderId(childOrder.getId());
+            assignment.setOrderId(childOrderId);
             assignment.setOrderNo(childOrder.getOrderNo());
             assignment.setPlatformBefore(parentOrder.getPlatformCode());
             assignment.setAssignedBy(operatorId);
             assignment.setAssignTime(now);
-            assignment.setAssignType("0");
+            assignment.setAssignType("0"); // 可按需定义
             assignment.setRemark(bo.getRemark());
             assignment.setAssigneeId(key.id());
             assignment.setAssigneeType(key.type());
-            baseMapper.insert(assignment); // 假设 baseMapper 是 OrderAssignmentMapper
+            baseMapper.insert(assignment); // 假设是 OrderAssignmentMapper
         }
 
-        Map<String, Object> stats = orderProductMapper.getAssignmentStats(parentId);
-        Long total = (Long) stats.getOrDefault("total", 0L);
-        Long assigned = (Long) stats.getOrDefault("assigned", 0L);
+        // 5. 更新主订单的拆分状态和分配状态
+        AssignmentStatsDto stats = orderProductMapper.getAssignmentStats(parentId);
+        Long total = stats.getTotal();
+        Long assigned = stats.getAssigned();
 
         String parentAssignmentStatus;
         if (assigned == 0) {
-            parentAssignmentStatus = OrderAssignStatus.WAIT_ASSIGN.getCode(); // 待分配
-        } else if (assigned.equals(total)) {
-            parentAssignmentStatus = OrderAssignStatus.ASSIGNED.getCode(); // 已分配
+            parentAssignmentStatus = OrderAssignStatus.WAIT_ASSIGN.getCode();
+        } else if (assigned == total) {
+            parentAssignmentStatus = OrderAssignStatus.ASSIGNED.getCode();
         } else {
-            parentAssignmentStatus = OrderAssignStatus.PARTIALLY_ASSIGNED.getCode();// 部分分配
+            parentAssignmentStatus = OrderAssignStatus.PARTIALLY_ASSIGNED.getCode();
         }
 
-        // 5. 更新父订单状态
         OrderMain updateParent = new OrderMain();
         updateParent.setId(parentId);
         updateParent.setSplitStatus(OrderSplitStatus.SPLITED.getCode()); // 已拆分

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

@@ -2,6 +2,7 @@ package org.dromara.order.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -9,6 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.DubboReference;
+import org.dromara.common.core.enums.OrderStatus;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -19,6 +21,7 @@ import org.dromara.order.domain.OrderMain;
 import org.dromara.order.domain.OrderProduct;
 import org.dromara.order.domain.bo.OrderMainBo;
 import org.dromara.order.domain.bo.OrderProductBo;
+import org.dromara.order.domain.dto.AssignmentStatsDto;
 import org.dromara.order.domain.vo.OrderMainVo;
 import org.dromara.order.domain.vo.OrderProductVo;
 import org.dromara.order.domain.vo.OrderStatusStats;
@@ -93,20 +96,11 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
             orderDeliverProductMapper.selectDeliverProductsByOrderId(orderMainVo.getId())
         );
 
-        Map<String, Object> stats = orderProductMapper.getAssignmentStats(orderMainVo.getId());
-        Object totalObj = stats.get("total");
-        Long total = (totalObj instanceof BigDecimal)
-            ? ((BigDecimal) totalObj).longValue()
-            : (totalObj instanceof Long)
-            ? (Long) totalObj
-            : 0L;
-
-        Object assignedObj = stats.get("assigned");
-        Long assigned = (assignedObj instanceof BigDecimal)
-            ? ((BigDecimal) assignedObj).longValue()
-            : (assignedObj instanceof Long)
-            ? (Long) assignedObj
-            : 0L;
+        // 查询主订单原始商品的总行数与已分配行数
+        AssignmentStatsDto stats = orderProductMapper.getAssignmentStats(orderMainVo.getId());
+        Long total = stats.getTotal();
+        Long assigned = stats.getAssigned();
+
         orderMainVo.setProductTotal(total);
         orderMainVo.setUnassigned(total - assigned);
         orderMainVo.setAssigned(assigned);
@@ -372,4 +366,22 @@ public class OrderMainServiceImpl extends ServiceImpl<OrderMainMapper, OrderMain
         }
         return baseMapper.deleteByIds(ids) > 0;
     }
+
+    @Override
+    public Boolean closeOrderByIds(Collection<Long> ids, Boolean isValid) {
+        if (ids == null || ids.isEmpty()) {
+            return true;
+        }
+
+        if (isValid) {
+            // TODO 业务校验
+        }
+
+        LambdaUpdateWrapper<OrderMain> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.in(OrderMain::getId, ids)
+            .set(OrderMain::getOrderStatus, OrderStatus.CLOSED.getCode());
+
+        int affectedRows = baseMapper.update(null, wrapper);
+        return affectedRows > 0;
+    }
 }

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

@@ -0,0 +1,136 @@
+package org.dromara.order.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.dromara.order.domain.bo.OrderOperateLogBo;
+import org.dromara.order.domain.vo.OrderOperateLogVo;
+import org.dromara.order.domain.OrderOperateLog;
+import org.dromara.order.mapper.OrderOperateLogMapper;
+import org.dromara.order.service.IOrderOperateLogService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 订单操作记录Service业务层处理
+ *
+ * @author LionLi
+ * @date 2026-01-26
+ */
+@Slf4j
+@RequiredArgsConstructor
+@Service
+public class OrderOperateLogServiceImpl  extends ServiceImpl<OrderOperateLogMapper, OrderOperateLog> implements IOrderOperateLogService {
+
+    private final OrderOperateLogMapper baseMapper;
+
+    /**
+     * 查询订单操作记录
+     *
+     * @param id 主键
+     * @return 订单操作记录
+     */
+    @Override
+    public OrderOperateLogVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询订单操作记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 订单操作记录分页列表
+     */
+    @Override
+    public TableDataInfo<OrderOperateLogVo> queryPageList(OrderOperateLogBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<OrderOperateLog> lqw = buildQueryWrapper(bo);
+        Page<OrderOperateLogVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的订单操作记录列表
+     *
+     * @param bo 查询条件
+     * @return 订单操作记录列表
+     */
+    @Override
+    public List<OrderOperateLogVo> queryList(OrderOperateLogBo bo) {
+        LambdaQueryWrapper<OrderOperateLog> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<OrderOperateLog> buildQueryWrapper(OrderOperateLogBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<OrderOperateLog> lqw = Wrappers.lambdaQuery();
+        lqw.orderByAsc(OrderOperateLog::getId);
+        lqw.eq(bo.getOrderId() != null, OrderOperateLog::getOrderId, bo.getOrderId());
+        lqw.eq(StringUtils.isNotBlank(bo.getAction()), OrderOperateLog::getAction, bo.getAction());
+        lqw.like(StringUtils.isNotBlank(bo.getUserName()), OrderOperateLog::getUserName, bo.getUserName());
+        lqw.eq(StringUtils.isNotBlank(bo.getPlatformCode()), OrderOperateLog::getPlatformCode, bo.getPlatformCode());
+        return lqw;
+    }
+
+    /**
+     * 新增订单操作记录
+     *
+     * @param bo 订单操作记录
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(OrderOperateLogBo bo) {
+        OrderOperateLog add = MapstructUtils.convert(bo, OrderOperateLog.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改订单操作记录
+     *
+     * @param bo 订单操作记录
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(OrderOperateLogBo bo) {
+        OrderOperateLog update = MapstructUtils.convert(bo, OrderOperateLog.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(OrderOperateLog entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除订单操作记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderOperateLogMapper.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.order.mapper.OrderOperateLogMapper">
+
+</mapper>

ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderProductMapper.xml

@@ -82,12 +82,23 @@
       AND del_flag = '0'
     </select>
 
-    <select id="getAssignmentStats" resultType="map">
+    <select id="getAssignmentStats" resultType="org.dromara.order.domain.dto.AssignmentStatsDto">
         SELECT COUNT(*)                                                 AS total,
                SUM(CASE WHEN assignment_status = '1' THEN 1 ELSE 0 END) AS assigned
         FROM order_product
-        WHERE order_id = #{orderId}
-          AND del_flag = '0'
+        WHERE order_id = #{parentId}
+          AND original_item_id IS NULL
     </select>
 
+    <update id="updateAssignmentInfo">
+        UPDATE order_product
+        SET assignment_status = #{assignmentStatus},
+        assigned_child_order_id = #{childOrderId},
+        update_time = #{updateTime}
+        WHERE id IN
+        <foreach collection="itemIds" item="id" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+
 </mapper>