超市零售添加收款金额,访客接口修改

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);

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;
 
 

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
      */