From 7804e7a907c6bb407b359fa144fd09fb081be09f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 07 一月 2025 17:50:39 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes
---
manage/src/main/resources/mapping/TInventoryMapper.xml | 2 +-
manage/src/main/java/com/jilongda/manage/model/TOptometrist.java | 5 +++++
manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java | 5 +++++
manage/src/main/java/com/jilongda/manage/service/impl/TOrderAftersalesServiceImpl.java | 4 ++--
manage/src/main/java/com/jilongda/manage/controller/TOptometristController.java | 18 ++++++++----------
manage/src/main/java/com/jilongda/manage/config/WebSecurityConfig.java | 4 ++--
manage/src/main/java/com/jilongda/manage/vo/TWarehousingVO.java | 2 ++
manage/src/main/java/com/jilongda/manage/service/impl/TOrderServiceImpl.java | 4 ++--
8 files changed, 27 insertions(+), 17 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/config/WebSecurityConfig.java b/manage/src/main/java/com/jilongda/manage/config/WebSecurityConfig.java
index 328ce4f..89cdfe6 100644
--- a/manage/src/main/java/com/jilongda/manage/config/WebSecurityConfig.java
+++ b/manage/src/main/java/com/jilongda/manage/config/WebSecurityConfig.java
@@ -61,8 +61,8 @@
*/
@Bean
public SecurityUtils securityUtils() {
- return new SecurityUtils(accessTokenCache,refreshTokenCache);
-// return new SecurityUtils();
+// return new SecurityUtils(accessTokenCache,refreshTokenCache);
+ return new SecurityUtils();
}
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TOptometristController.java b/manage/src/main/java/com/jilongda/manage/controller/TOptometristController.java
index 0c71e55..8a9e317 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOptometristController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOptometristController.java
@@ -15,6 +15,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -57,13 +58,10 @@
}
@ApiOperation(value = "验光师添加")
@PostMapping(value = "/add")
- public ApiResult<String> add(@RequestBody TOptometrist dto) {
- if (StringUtils.hasLength(dto.getName())&&dto.getName().length()>15){
- return ApiResult.failed("验光师名称不能超过15个字");
- }
- TOptometrist one = optometristService.lambdaQuery().eq(TOptometrist::getPhone, dto.getPhone())
- .eq(TOptometrist::getStatus, 1).one();
- if (one!=null){
+ public ApiResult<String> add(@Validated @RequestBody TOptometrist dto) {
+ Long count = optometristService.lambdaQuery().eq(TOptometrist::getPhone, dto.getPhone())
+ .eq(TOptometrist::getStatus, 1).count();
+ if (count>0){
return ApiResult.failed("当前号码已存在");
}
List<SecUser> list = secUserService.lambdaQuery().eq(SecUser::getPhone, dto.getPhone()).list();
@@ -79,10 +77,10 @@
return ApiResult.failed("验光师名称不能超过15个字");
}
- TOptometrist one = optometristService.lambdaQuery().eq(TOptometrist::getPhone, dto.getPhone())
+ Long count = optometristService.lambdaQuery().eq(TOptometrist::getPhone, dto.getPhone())
.ne(TOptometrist::getId,dto.getId())
- .eq(TOptometrist::getStatus, 1).one();
- if (one!=null){
+ .eq(TOptometrist::getStatus, 1).count();
+ if (count>0){
return ApiResult.failed("当前号码已存在");
}
List<SecUser> list = secUserService.lambdaQuery().eq(SecUser::getPhone, dto.getPhone()).list();
diff --git a/manage/src/main/java/com/jilongda/manage/model/TOptometrist.java b/manage/src/main/java/com/jilongda/manage/model/TOptometrist.java
index 6872bf1..6f6f566 100644
--- a/manage/src/main/java/com/jilongda/manage/model/TOptometrist.java
+++ b/manage/src/main/java/com/jilongda/manage/model/TOptometrist.java
@@ -12,6 +12,9 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Length;
+
+import javax.validation.constraints.NotBlank;
/**
* <p>
@@ -34,6 +37,8 @@
private Integer id;
@ApiModelProperty(value = "验光师名称")
+ @NotBlank(message = "验光师名称不能为空")
+ @Length(max = 15,message = "验光师名称不能超过15个字")
@TableField("name")
private String name;
diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/TOrderAftersalesServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/TOrderAftersalesServiceImpl.java
index 5a8b7ed..3a33444 100644
--- a/manage/src/main/java/com/jilongda/manage/service/impl/TOrderAftersalesServiceImpl.java
+++ b/manage/src/main/java/com/jilongda/manage/service/impl/TOrderAftersalesServiceImpl.java
@@ -49,8 +49,8 @@
List<TOrderAftersalesVO> list = this.baseMapper.pageList(query,pageInfo);
for (TOrderAftersalesVO tOrderAftersalesVO : list) {
TOrder tOrder = orderMapper.selectById(tOrderAftersalesVO.getOrderId());
- if (tOrder.getUserId()!=null){
- TAppUser tAppUser = appUserMapper.selectById(tOrder.getUserId());
+ TAppUser tAppUser = appUserMapper.selectById(tOrder.getUserId());
+ if (tAppUser!=null){
tOrderAftersalesVO.setName(tAppUser.getName());
tOrderAftersalesVO.setRealName(tAppUser.getRealName());
tOrderAftersalesVO.setPhone(tAppUser.getPhone());
diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/TOrderServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/TOrderServiceImpl.java
index 2f01b0d..e6962da 100644
--- a/manage/src/main/java/com/jilongda/manage/service/impl/TOrderServiceImpl.java
+++ b/manage/src/main/java/com/jilongda/manage/service/impl/TOrderServiceImpl.java
@@ -62,8 +62,8 @@
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
for (TOrder tOrder : list) {
TOrderListVO tOrderListVO = new TOrderListVO();
- if (tOrder.getUserId()!=null){
- TAppUser tAppUser = appUserMapper.selectById(tOrder.getUserId());
+ TAppUser tAppUser = appUserMapper.selectById(tOrder.getUserId());
+ if (tAppUser!=null){
tOrderListVO.setWxName(tAppUser.getName());
}
TStore tStore = storeMapper.selectById(tOrder.getStoreId());
diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java
index fe8dfbe..6a960eb 100644
--- a/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java
+++ b/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java
@@ -91,12 +91,17 @@
public PageInfo<TWarehousingVO> inventoryReceiptList(TWarehousingDetailQuery query) {
PageInfo<TWarehousingVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
List<TWarehousingVO> list = this.baseMapper.inventoryReceiptList(query,pageInfo);
+ List<TStore> stores = storeMapper.selectList(Wrappers.lambdaQuery(TStore.class)
+ .in(TStore::getId, list.stream().map(TWarehousingVO::getStoreId).collect(Collectors.toList())));
for (TWarehousingVO tWarehousingVO : list) {
List<TFrameWarehousingDetail> tFrameWarehousingDetails = frameWarehousingDetailMapper.selectList(Wrappers.lambdaQuery(TFrameWarehousingDetail.class)
.eq(TFrameWarehousingDetail::getWarehousingId, tWarehousingVO.getId()));
if(CollectionUtils.isNotEmpty(tFrameWarehousingDetails)){
tWarehousingVO.setTotalNum(tFrameWarehousingDetails.stream().mapToInt(TFrameWarehousingDetail::getTotal).sum());
}
+ stores.stream().filter(tStore -> tStore.getId().equals(tWarehousingVO.getStoreId())).findFirst().ifPresent(tStore -> {
+ tWarehousingVO.setStoreName(tStore.getName());
+ });
}
pageInfo.setRecords(list);
return pageInfo;
diff --git a/manage/src/main/java/com/jilongda/manage/vo/TWarehousingVO.java b/manage/src/main/java/com/jilongda/manage/vo/TWarehousingVO.java
index 89f8bf6..0e63602 100644
--- a/manage/src/main/java/com/jilongda/manage/vo/TWarehousingVO.java
+++ b/manage/src/main/java/com/jilongda/manage/vo/TWarehousingVO.java
@@ -14,6 +14,8 @@
@ApiModelProperty(value = "出库/入库合计数量")
private Integer totalNum=0;
+ @ApiModelProperty(value = "门店名称")
+ private String storeName;
@ApiModelProperty(value = "出库/入库明细")
private List<TFrameWarehousingDetail> frameWarehousingDetails;
diff --git a/manage/src/main/resources/mapping/TInventoryMapper.xml b/manage/src/main/resources/mapping/TInventoryMapper.xml
index 07fe3d3..6efbc61 100644
--- a/manage/src/main/resources/mapping/TInventoryMapper.xml
+++ b/manage/src/main/resources/mapping/TInventoryMapper.xml
@@ -41,7 +41,7 @@
and t1.createTime between #{query.startTime} and #{query.endTime}
</if>
and t1.isDelete = ${@com.jilongda.common.enums.DisabledEnum@NO.getCode()}
-
+ order by t1.createTime desc
</select>
</mapper>
--
Gitblit v1.7.1