From 7702bb9c1b14b2cde3846d6f6c4136a38142e567 Mon Sep 17 00:00:00 2001
From: zjf <1799650030@qq.com>
Date: Wed, 30 Jul 2025 18:12:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B6=85=E5=B8=82=E9=9B=B6=E5=94=AE=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=94=B6=E6=AC=BE=E9=87=91=E9=A2=9D,=E8=AE=BF?=
 =?UTF-8?q?=E5=AE=A2=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/VisitorsServiceImpl.java     | 20 ++++++++++++++-----
 .../InventoryRecordEditDTO.java               |  2 +-
 .../InventoryRecordSaveDTO.java               |  3 +++
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java
index 7f9231bc2..3cf818778 100644
--- a/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java
+++ b/pjcloud-integrated/pjcloud-integrated-biz/src/main/java/com/bsd/pjcloud/integrated/service/impl/VisitorsServiceImpl.java
@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.admin.api.dto.UserInfo;
+import com.bsd.pjcloud.admin.api.entity.SysDept;
 import com.bsd.pjcloud.admin.api.entity.SysDictItem;
+import com.bsd.pjcloud.admin.api.feign.RemoteDeptService;
 import com.bsd.pjcloud.admin.api.feign.RemoteDictService;
 import com.bsd.pjcloud.admin.api.feign.RemoteUserService;
 import com.bsd.pjcloud.common.core.exception.ServiceException;
@@ -98,6 +100,8 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
     private final RemoterThirdPartySmsService reminderThirdPartySmsService;
 
     private final VisitorUserService visitorUserService;
+
+    private final RemoteDeptService remoteDeptService;
     @Value("${visitor.jwt-secret}")
     private String visitorJwtSecret;
 
@@ -304,6 +308,12 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
         bean.setUserId(visitUser.getId());
         bean.setCreateBy(visitUser.getRealName());
         bean.setCheckStatus(TaskCheckStatusEnum.PADDING.getCode());
+        Long userId = SecurityUtils.getUser().getId();
+        bean.setReceiveId(userId);
+        Long deptId = SecurityUtils.getUser().getDeptId();
+        bean.setDeptId(deptId);
+        R<SysDept> deptByDeptId = remoteDeptService.getDeptByDeptId(deptId);
+        bean.setDeptName(deptByDeptId.getData().getName());
 
         String uniqueToken = UUID.randomUUID().toString();
         String token = uniqueToken.replace("-", "");
@@ -316,12 +326,12 @@ public class VisitorsServiceImpl extends ServiceImpl<VisitorsMapper, VisitorsEnt
     public Object getPageYY(Page page, VisitorsEntity visitors) {
         Long userId = SecurityUtils.getUser().getId();
         LambdaQueryWrapper<VisitorsEntity> wrapper = new LambdaQueryWrapper<>();
-        if (StringUtils.isNotBlank(visitors.getType())&&VisitorTypeEnum.ZDYQ.getType().equals(visitors.getType())){
-            wrapper.eq(VisitorsEntity::getUserId, userId);
-            wrapper.eq(VisitorsEntity::getType, visitors.getType());
-        }else {
+//        if (StringUtils.isNotBlank(visitors.getType())&&VisitorTypeEnum.ZDYQ.getType().equals(visitors.getType())){
+//            wrapper.eq(VisitorsEntity::getUserId, userId);
+            wrapper.eq(StringUtils.isNotBlank(visitors.getType()),VisitorsEntity::getType, visitors.getType());
+//        }else {
             wrapper.eq(VisitorsEntity::getReceiveId, userId);
-        }
+//        }
         wrapper.eq(StringUtils.isNotBlank(visitors.getCheckStatus()),VisitorsEntity::getCheckStatus, visitors.getCheckStatus());
         wrapper.orderByDesc(VisitorsEntity::getCreateTime);
         Page pageData = baseMapper.selectPage(page, wrapper);
diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordEditDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordEditDTO.java
index ee8253d37..2206d5da8 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordEditDTO.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordEditDTO.java
@@ -113,7 +113,7 @@ public class InventoryRecordEditDTO {
     private Integer totalAmount;
 
 
-    @Schema(description="收货数量")
+    @Schema(description="收款金额")
     private Integer receiveAmount;
 
 
diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordSaveDTO.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordSaveDTO.java
index b8a0d899e..e5b160016 100644
--- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordSaveDTO.java
+++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/dto/inventoryrecords/InventoryRecordSaveDTO.java
@@ -91,6 +91,9 @@ public class  InventoryRecordSaveDTO {
     @NotNull
     private String orderType;
 
+    @Schema(description="收款金额")
+    private Integer receiveAmount;
+
     /**
      * @Link SmCgPlanSaveItemDTO
      */