修复部分bug

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysComplaintController.java

@@ -9,6 +9,7 @@ import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
 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.common.web.core.BaseController;
 import org.dromara.system.domain.bo.SysComplaintBo;
 import org.dromara.system.domain.vo.SysComplaintVo;
@@ -45,9 +46,7 @@ public class SysComplaintController extends BaseController {
     @RepeatSubmit()
     @PostMapping
     public R<Void> submit(@Validated @RequestBody SysComplaintBo bo) {
-        String loginId = StpUtil.getLoginIdAsString();
-        Long customerId = Long.parseLong(loginId.replace("customer:", ""));
-        bo.setCustomerId(customerId);
+        bo.setCustomerId(LoginHelper.getUserId());
         return toAjax(sysComplaintService.insertByBo(bo));
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysPhone.java

@@ -37,4 +37,9 @@ public class SysPhone extends BaseEntity {
      */
     private String servicePhone;
 
+    /**
+     * 业务员电话
+     */
+    private String salesPhone;
+
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysPhoneBo.java

@@ -40,4 +40,11 @@ public class SysPhoneBo extends BaseEntity {
     @Size(min = 1, max = 20, message = "客服电话长度不能超过{max}个字符")
     private String servicePhone;
 
+    /**
+     * 业务员电话
+     */
+    @NotBlank(message = "业务员电话不能为空")
+    @Size(min = 1, max = 20, message = "业务员电话长度不能超过{max}个字符")
+    private String salesPhone;
+
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysPhoneVo.java

@@ -35,6 +35,11 @@ public class SysPhoneVo implements Serializable {
      */
     private String servicePhone;
 
+    /**
+     * 业务员电话
+     */
+    private String salesPhone;
+
     /**
      * 更新时间
      */

ruoyi-modules/yingpaipay-erp/src/main/java/org/dromara/erp/service/impl/ErpOrderServiceImpl.java

@@ -43,7 +43,7 @@ public class ErpOrderServiceImpl implements IErpOrderService {
     public TableDataInfo<ErpOrderVo> queryPageList(ErpOrderQuery query, PageQuery pageQuery) {
         LambdaQueryWrapper<ErpOrder> lqw = buildQueryWrapper(query);
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<ErpOrderVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
-        
+
         List<ErpOrderVo> list = result.getRecords();
         if (ObjectUtil.isNotEmpty(list)) {
             fillOrderDetails(list);
@@ -75,7 +75,7 @@ public class ErpOrderServiceImpl implements IErpOrderService {
         LambdaQueryWrapper<org.dromara.erp.domain.ErpOrderDetail> detailLqw = Wrappers.lambdaQuery();
         detailLqw.in(org.dromara.erp.domain.ErpOrderDetail::getOrderId, orderIds);
         List<org.dromara.erp.domain.vo.ErpOrderDetailVo> allDetails = erpOrderDetailMapper.selectVoList(detailLqw);
-        
+
         for (ErpOrderVo vo : list) {
             List<org.dromara.erp.domain.vo.ErpOrderDetailVo> details = allDetails.stream()
                     .filter(d -> vo.getRowId().equals(d.getOrderId()))
@@ -124,10 +124,10 @@ public class ErpOrderServiceImpl implements IErpOrderService {
                 log.info("[调试] 开始自动填充 Placer...");
                 log.info("[调试] 当前是否登录: {}", org.dromara.common.satoken.utils.LoginHelper.isLogin());
                 log.info("[调试] 当前 Token: {}", cn.dev33.satoken.stp.StpUtil.getTokenValue());
-                
+
                 Long userId = org.dromara.common.satoken.utils.LoginHelper.getUserId();
                 log.info("[调试] 获取到的用户 ID: {}", userId);
-                
+
                 if (userId != null) {
                     entity.setPlacer(userId);
                     log.info("[调试] 自动填充 Placer 成功: {}", userId);
@@ -146,7 +146,7 @@ public class ErpOrderServiceImpl implements IErpOrderService {
         }
 
         boolean result = baseMapper.insert(entity) > 0;
-        
+
         if (result && ObjectUtil.isNotEmpty(bo.getDetailIds())) {
             // 根据前端传递的明细 ID 列表，精确更新这批明细关联的订单 ID
             com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper<org.dromara.erp.domain.ErpOrderDetail> luw = Wrappers.lambdaUpdate();
@@ -165,7 +165,7 @@ public class ErpOrderServiceImpl implements IErpOrderService {
         if (order == null) {
             throw new org.dromara.common.core.exception.ServiceException("订单不存在");
         }
-        
+
         // 根据审核结果设置订单状态
         if (ErpAuditResult.PASS.getCode().equals(audit.getAuditResult())) { // 通过 → 待签批
             order.setStatus(ErpOrderStatus.WAIT_SIGN.getCode());
@@ -234,7 +234,7 @@ public class ErpOrderServiceImpl implements IErpOrderService {
                     newStatus = ErpOrderStatus.FINISHED.getCode();
                 } else if (Integer.valueOf(1).equals(master.getReviewed())) {
                     // 已签批
-                    newStatus = ErpOrderStatus.WAIT_SIGN.getCode();
+                    newStatus = ErpOrderStatus.PRODUCING.getCode();
                 } else if (Integer.valueOf(1).equals(master.getApproved())) {
                     // 已审核
                     newStatus = ErpOrderStatus.WAIT_SIGN.getCode();

script/sql/sqlserver/v1/HS_ERP_Order-create.sql

@@ -9,6 +9,7 @@ create table sys_phone
     id              bigint            NOT NULL,
     expert_phone    nvarchar(20)      DEFAULT ('') NULL,
     service_phone   nvarchar(20)      DEFAULT ('') NULL,
+    sales_phone     nvarchar(20)      DEFAULT ('') NULL,
     create_dept     bigint,
     create_by       bigint,
     create_time     datetime2(7),
@@ -27,5 +28,7 @@ EXEC sys.sp_addextendedproperty 'MS_Description', N'华晟型材专家电话', '
 GO
 EXEC sys.sp_addextendedproperty 'MS_Description', N'客服电话', 'SCHEMA', N'dbo', 'TABLE', N'sys_phone', 'COLUMN', N'service_phone'
 GO
+EXEC sys.sp_addextendedproperty 'MS_Description', N'业务员电话', 'SCHEMA', N'dbo', 'TABLE', N'sys_phone', 'COLUMN', N'sales_phone'
+GO
 EXEC sys.sp_addextendedproperty 'MS_Description', N'联系电话管理表', 'SCHEMA', N'dbo', 'TABLE', N'sys_phone'
 GO

script/sql/sqlserver/v1/HS_ERP_Order-update.sql

@@ -10,6 +10,6 @@ GO
 -- ----------------------------
 -- sys_phone 初始数据
 -- ----------------------------
-INSERT INTO [dbo].[sys_phone] ([id], [expert_phone], [service_phone], [create_by], [create_time], [update_by], [update_time])
-VALUES (1, N'13888888888', N'13888888888', 1, GETDATE(), 1, GETDATE());
+INSERT INTO [dbo].[sys_phone] ([id], [expert_phone], [service_phone], [sales_phone], [create_by], [create_time], [update_by], [update_time])
+VALUES (1, N'13888888888', N'13888888888', N'13888888888', 1, GETDATE(), 1, GETDATE());
 GO