✨ 完善核销用户记录和毛利报表导出日志

bms-back/bms-system/src/main/java/com/bms/ar/domain/ArBalanceWriteoff.java

@@ -65,6 +65,12 @@ public class ArBalanceWriteoff extends BaseEntity
     /** 核销备注 */
     private String remark;
 
+    /** 执行核销的用户主键 */
+    private Long createUserId;
+
+    /** 执行反核销的用户主键 */
+    private Long cancelUserId;
+
     /** 反核销人 */
     private String cancelBy;
 

bms-back/bms-system/src/main/java/com/bms/ar/mapper/ArBalanceWriteoffMapper.java

@@ -27,6 +27,7 @@ public interface ArBalanceWriteoffMapper
     int updateCancelled(@Param("writeoffId") Long writeoffId,
         @Param("reverseFlowId") Long reverseFlowId,
         @Param("cancelBy") String cancelBy,
+        @Param("cancelUserId") Long cancelUserId,
         @Param("cancelRemark") String cancelRemark,
         @Param("status") String status,
         @Param("effectiveStatus") String effectiveStatus);

bms-back/bms-system/src/main/java/com/bms/ar/service/impl/ArBalanceWriteoffServiceImpl.java

@@ -116,6 +116,7 @@ public class ArBalanceWriteoffServiceImpl implements IArBalanceWriteoffService {
         }
 
         String operator = SecurityUtils.getUsername();
+        Long operatorUserId = SecurityUtils.getUserId();
         String requestId = IdUtils.fastSimpleUUID();
         String currency = StringUtils.hasText(bill.getCurrency()) ? bill.getCurrency().trim().toUpperCase() : "CNY";
         Date writeoffDate = cmd.getWriteoffDate() != null ? cmd.getWriteoffDate() : new Date();
@@ -133,6 +134,7 @@ public class ArBalanceWriteoffServiceImpl implements IArBalanceWriteoffService {
         writeoff.setWriteoffDate(writeoffDate);
         writeoff.setStatus(ArBalanceWriteoffStatus.EFFECTIVE.getCode());
         writeoff.setRemark(StringUtils.hasText(cmd.getRemark()) ? cmd.getRemark().trim() : null);
+        writeoff.setCreateUserId(operatorUserId);
         writeoff.setCreateBy(operator);
         writeoffMapper.insertArBalanceWriteoff(writeoff);
 
@@ -177,6 +179,7 @@ public class ArBalanceWriteoffServiceImpl implements IArBalanceWriteoffService {
         }
 
         String operator = SecurityUtils.getUsername();
+        Long operatorUserId = SecurityUtils.getUserId();
         String requestId = IdUtils.fastSimpleUUID();
         String cancelRemark = StringUtils.hasText(remark) ? remark.trim() : "取消余额核销";
         String fromStatus = bill.getStatus();
@@ -195,7 +198,7 @@ public class ArBalanceWriteoffServiceImpl implements IArBalanceWriteoffService {
         }
 
         // 3. 核销单置为CANCELLED（口径变更后无回补流水，reverse_flow_id 置空）
-        if (writeoffMapper.updateCancelled(writeoffId, null, operator, cancelRemark,
+        if (writeoffMapper.updateCancelled(writeoffId, null, operator, operatorUserId, cancelRemark,
                 ArBalanceWriteoffStatus.CANCELLED.getCode(), ArBalanceWriteoffStatus.EFFECTIVE.getCode()) != 1) {
             throw new ServiceException("核销记录状态已变化，请刷新后重试");
         }

bms-back/bms-system/src/main/java/com/bms/price/domain/PrcProfitReportExport.java

@@ -22,6 +22,8 @@ public class PrcProfitReportExport implements Serializable
     private Integer rowCount;
     /** PROCESSING 生成中，SUCCESS 成功，FAILED 失败。 */
     private String exportStatus;
+    /** 发起导出的用户主键。 */
+    private Long exportUserId;
     private String exportBy;
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date exportTime;

bms-back/bms-system/src/main/java/com/bms/price/mapper/PrcProfitReportMapper.java

@@ -23,8 +23,7 @@ public interface PrcProfitReportMapper
 
     int markExportFailed(@Param("exportId") Long exportId, @Param("remark") String remark);
 
-    List<PrcProfitReportExport> selectExportsByUser(String exportBy);
+    List<PrcProfitReportExport> selectExports();
 
-    PrcProfitReportExport selectExportByIdAndUser(@Param("exportId") Long exportId,
-                                                   @Param("exportBy") String exportBy);
+    PrcProfitReportExport selectExportById(@Param("exportId") Long exportId);
 }

bms-back/bms-system/src/main/java/com/bms/price/service/IPrcProfitReportService.java

@@ -23,9 +23,9 @@ public interface IPrcProfitReportService
 
     int failExport(Long exportId, String remark);
 
-    List<PrcProfitReportExport> selectExports(String exportBy);
+    List<PrcProfitReportExport> selectExports();
 
-    PrcProfitReportExport selectExport(Long exportId, String exportBy);
+    PrcProfitReportExport selectExport(Long exportId);
 
     /* 提成比例维护暂停使用。
     List<PrcProfitCommissionRate> selectCommissionRates();

bms-back/bms-system/src/main/java/com/bms/price/service/impl/PrcProfitReportServiceImpl.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
 // 提成功能暂停使用：import org.springframework.transaction.annotation.Transactional;
 import com.bms.common.annotation.DataScope;
 import com.bms.common.exception.ServiceException;
-// 提成功能暂停使用：import com.bms.common.utils.SecurityUtils;
+import com.bms.common.utils.SecurityUtils;
 // 提成功能暂停使用：import com.bms.price.domain.PrcProfitCommissionRate;
 // 提成功能暂停使用：import com.bms.price.mapper.PrcProfitCommissionRateMapper;
 import com.bms.price.domain.PrcProfitReportExport;
@@ -61,6 +61,7 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService
     @Override
     public int createExport(PrcProfitReportExport export)
     {
+        export.setExportUserId(SecurityUtils.getUserId());
         return profitReportMapper.insertExport(export);
     }
 
@@ -77,15 +78,15 @@ public class PrcProfitReportServiceImpl implements IPrcProfitReportService
     }
 
     @Override
-    public List<PrcProfitReportExport> selectExports(String exportBy)
+    public List<PrcProfitReportExport> selectExports()
     {
-        return profitReportMapper.selectExportsByUser(exportBy);
+        return profitReportMapper.selectExports();
     }
 
     @Override
-    public PrcProfitReportExport selectExport(Long exportId, String exportBy)
+    public PrcProfitReportExport selectExport(Long exportId)
     {
-        return profitReportMapper.selectExportByIdAndUser(exportId, exportBy);
+        return profitReportMapper.selectExportById(exportId);
     }
 
     /** 将报表的多行输入拆分为去重后的查询条件，支持换行、空格、逗号和分号分隔。 */