From 54abb5ddf28802b9a89061e921472e71e5e974cc Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 19 十月 2023 17:57:50 +0800
Subject: [PATCH] #路径拼接
---
server/services/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java | 6 +++---
server/services/src/main/resources/mappers/SystemUserMapper.xml | 3 +--
server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java | 10 ++++++++--
server/services/src/main/resources/application-dev.yml | 4 ++--
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 2 +-
server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java | 9 +++++----
6 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java b/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
index 530fea1..a3f1165 100644
--- a/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
+++ b/server/services/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
@@ -106,10 +106,15 @@
@Override
@Transactional
public void create(CreateSystemUserDTO systemUser) {
+
+ if (StringUtils.isBlank(systemUser.getMobile()) || systemUser.getMobile().length() < 6){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍒涘缓鐢ㄦ埛鍙傛暟閿欒");
+ }
// 楠岃瘉鐢ㄦ埛鍚�
SystemUser queryUserDto = new SystemUser();
queryUserDto.setUsername(systemUser.getUsername());
queryUserDto.setDeleted(Constants.ZERO);
+ queryUserDto.setUsername(systemUser.getMobile());
SystemUser user = systemUserService.findOne(queryUserDto);
if (user != null) {
throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐢ㄦ埛鍚嶅凡瀛樺湪");
@@ -128,9 +133,10 @@
// 鐢熸垚瀵嗙爜鐩�
String salt = RandomStringUtils.randomAlphabetic(6);
// 鐢熸垚瀵嗙爜
- systemUser.setPassword(Utils.Secure.encryptPassword(systemUser.getPassword(), salt));
+ systemUser.setPassword(Utils.Secure.encryptPassword(systemUser.getMobile().substring(systemUser.getMobile().length() - 6), salt));
systemUser.setSalt(salt);
systemUser.setId(UUID.randomUUID().toString());
+ systemUser.setUsername(systemUser.getMobile());
// 鍒涘缓鐢ㄦ埛璁板綍
systemUserService.create(systemUser);
// 璁剧疆閮ㄩ棬
@@ -141,7 +147,7 @@
systemDepartmentUser.setOperaUser(systemUser.getCreateUser());
systemDepartmentUser.setOperaTime(new Date());
systemDepartmentUserService.create(systemDepartmentUser);
- }
+ }
// 璁剧疆宀椾綅
if (systemUser.getPositionIds() != null && systemUser.getPositionIds().size() > 0) {
for (Integer positionId : systemUser.getPositionIds()) {
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
index 708b526..07648d9 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
@@ -17,6 +17,7 @@
import org.springframework.util.CollectionUtils;
import java.util.List;
+import java.util.Objects;
/**
* 骞垮憡淇℃伅琛⊿ervice瀹炵幇
@@ -66,11 +67,11 @@
.eq(Ad::getId,ad.getId())
.set(Ad::getEditor,ad.getEditor())
.set(Ad::getEditDate,ad.getEditDate())
- .set(Ad::getName,ad.getName())
- .set(Ad::getImgurl,ad.getImgurl())
+ .set(Objects.nonNull(ad.getName()),Ad::getName,ad.getName())
+ .set(Objects.nonNull(ad.getImgurl()),Ad::getImgurl,ad.getImgurl())
.set(Ad::getSortnum,ad.getSortnum())
- .set(Ad::getContent,ad.getContent())
- .set(Ad::getStatus,ad.getStatus());
+ .set(Objects.nonNull(ad.getContent()),Ad::getContent,ad.getContent())
+ .set(Objects.nonNull(ad.getStatus()),Ad::getStatus,ad.getStatus());
adMapper.update(null,wrapper);
}
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 7726ace..061060b 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -524,7 +524,7 @@
RefundDTO refundDTO = new RefundDTO();
refundDTO.setOrderId(orderId);
refundDTO.setCanBalance(canBalance);
- refundDTO.setRefundAmount(money);
+ refundDTO.setRefundAmount(money.multiply(new BigDecimal(100)));
refundDTO.setTotalAmount(goodsorder.getMoney());
refundDTO.setMemberId(goodsorder.getMemberId());
refundDTO.setCreator(principal.getId());
diff --git a/server/services/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/services/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
index 42baca1..a96e931 100644
--- a/server/services/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -113,7 +113,7 @@
Wrapper<SystemUser> wrapper = new QueryWrapper<>(systemUser);
return systemUserMapper.selectList(wrapper);
}
-
+
@Override
public PageData<SystemUserListVO> findPage(PageWrap<QuerySystemUserDTO> pageWrap) {
// 鏍归儴闂ㄦ潯浠跺鐞嗭紙闇�鏌ヨ鏍归儴闂ㄤ笅鎵�鏈夐儴闂ㄧ殑鐢ㄦ埛锛�
@@ -144,8 +144,8 @@
user.setRoles(systemRoleService.findByUserId(user.getId()));
// 鏌ヨ鐢ㄦ埛宀椾綅鍒楄〃
user.setPositions(systemPositionService.findByUserId(user.getId()));
- String imgPath = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.FILES_DIR,Constants.AVATAR_FILE).getCode();
- user.setAvatar(Constants.formatImgPath(user.getAvatar(),imgPath));
+// String imgPath = systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode()+systemDictDataBiz.queryByCode(Constants.FILES_DIR,Constants.AVATAR_FILE).getCode();
+ user.setAvatar(Constants.formatImgPath(user.getAvatar(),""));
}
return PageData.from(new PageInfo<>(userList));
}
diff --git a/server/services/src/main/resources/application-dev.yml b/server/services/src/main/resources/application-dev.yml
index 38a3e17..5f66561 100644
--- a/server/services/src/main/resources/application-dev.yml
+++ b/server/services/src/main/resources/application-dev.yml
@@ -50,8 +50,8 @@
mchKey: u4TSNtv0wFP7WRfnxBgijYOtRhS9FvlM
# notifyUrl: http://xiaopiqiu.natapp1.cc/api/wxPayNotify
notifyUrl: https://dmtest.ahapp.net/bike_h5_api/api/wxPayNotify
-# keyPath: D:\DouMee\config\doumeeTest\apiclient_cert.p12
- keyPath: /usr/local/apiclient_cert.p12
+ keyPath: D:\DouMee\config\doumeeTest\apiclient_cert.p12
+# keyPath: /usr/local/apiclient_cert.p12
########################mqtt鐩稿叧閰嶇疆########################
mqtt:
host: tcp://175.27.187.84:1883
diff --git a/server/services/src/main/resources/mappers/SystemUserMapper.xml b/server/services/src/main/resources/mappers/SystemUserMapper.xml
index cda835b..4e3503d 100644
--- a/server/services/src/main/resources/mappers/SystemUserMapper.xml
+++ b/server/services/src/main/resources/mappers/SystemUserMapper.xml
@@ -63,7 +63,7 @@
select
distinct
usr.id, usr.birthday, usr.email, usr.emp_no, usr.mobile, usr.avatar, usr.username, usr.realname, usr.sex, usr.fixed, usr.create_time, usr.update_time,
- usr.admin_type,usr.user_type,usr.nickname,usr.accepted_number,usr.total_integral,usr.type,
+ usr.nickname,
create_user.id create_user_id, create_user.username create_user_name,
update_user.id updete_user_id, update_user.username update_user_name
from "system_user" usr
@@ -82,7 +82,6 @@
</if>
</where>
- order by usr.accepted_number desc
</select>
--
Gitblit v1.9.3