bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
gaowdong 2025-07-03 09:15:29 +08:00
parent 8764dae833 b979ccbc97
commit f74b79ed8b
3 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicAreaServiceImpl.java
View File

@ -12,7 +12,6 @@ import com.bonus.canteen.core.supermarket.mapper.SupermarketInfoMapper;
import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.core.utils.StringUtils;
import com.bonus.common.core.utils.encryption.Sm4Utils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.bonus.canteen.core.basic.mapper.BasicAreaMapper;
@ -44,9 +43,7 @@ public class BasicAreaServiceImpl implements IBasicAreaService {
*/
@Override
public BasicArea selectBasicAreaByAreaId(Long areaId) {
BasicArea basicArea = basicAreaMapper.selectBasicAreaByAreaId(areaId);
basicArea.setContactTel(Sm4Utils.encrypt(basicArea.getContactTel()));
return basicArea;
return basicAreaMapper.selectBasicAreaByAreaId(areaId);
}
/**
@ -57,16 +54,13 @@ public class BasicAreaServiceImpl implements IBasicAreaService {
*/
@Override
public List<BasicArea> selectBasicAreaList(BasicArea basicArea) {
List<BasicArea> list = basicAreaMapper.selectBasicAreaList(basicArea);
list.stream().forEach(item -> item.setContactTel(Sm4Utils.encrypt(item.getContactTel())));
return list;
return basicAreaMapper.selectBasicAreaList(basicArea);
}
@Override
public List<TreeSelect> selectAreaTreeList(BasicArea area) {
List<BasicArea> list = selectBasicAreaList(area);
list.stream().forEach(item -> item.setContactTel(Sm4Utils.encrypt(item.getContactTel())));
return buildAreaTreeSelect(list);
List<BasicArea> areas = selectBasicAreaList(area);
return buildAreaTreeSelect(areas);
}
/**

9
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicCanteenServiceImpl.java
View File

@ -8,7 +8,6 @@ import com.bonus.canteen.core.basic.mapper.BasicStallMapper;
import com.bonus.canteen.core.utils.BnsConstants;
import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.core.utils.encryption.Sm4Utils;
import com.bonus.common.security.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -37,9 +36,7 @@ public class BasicCanteenServiceImpl implements IBasicCanteenService {
*/
@Override
public BasicCanteen selectBasicCanteenByCanteenId(Long canteenId) {
BasicCanteen basicCanteen = basicCanteenMapper.selectBasicCanteenByCanteenId(canteenId);
basicCanteen.setContactTel(Sm4Utils.encrypt(basicCanteen.getContactTel()));
return basicCanteen;
return basicCanteenMapper.selectBasicCanteenByCanteenId(canteenId);
}
/**
@ -50,9 +47,7 @@ public class BasicCanteenServiceImpl implements IBasicCanteenService {
*/
@Override
public List<BasicCanteen> selectBasicCanteenList(BasicCanteen basicCanteen) {
List<BasicCanteen> list = basicCanteenMapper.selectBasicCanteenList(basicCanteen);
list.stream().forEach(item -> item.setContactTel(Sm4Utils.encrypt(item.getContactTel())));
return list;
return basicCanteenMapper.selectBasicCanteenList(basicCanteen);
}
/**

6
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicStallServiceImpl.java
View File

@ -13,7 +13,6 @@ import com.bonus.canteen.core.device.mapper.DeviceBindMapper;
import com.bonus.canteen.core.utils.BnsConstants;
import com.bonus.common.core.exception.ServiceException;
import com.bonus.common.core.utils.DateUtils;
import com.bonus.common.core.utils.encryption.Sm4Utils;
import com.bonus.common.security.utils.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -52,7 +51,6 @@ public class BasicStallServiceImpl implements IBasicStallService {
List<BasicStallMealtime> basicStallMealtimes = basicStallMealtimeMapper.selectBasicStallMealtimeList(basicStallMealtime);
BasicStall basicStall = basicStallMapper.selectBasicStallByStallId(stallId);
basicStall.setBasicStallMealtimeList(basicStallMealtimes);
basicStall.setContactTel(Sm4Utils.encrypt(basicStall.getContactTel()));
return basicStall;
}
@ -64,9 +62,7 @@ public class BasicStallServiceImpl implements IBasicStallService {
*/
@Override
public List<BasicStall> selectBasicStallList(BasicStall basicStall) {
List<BasicStall> list = basicStallMapper.selectBasicStallList(basicStall);
list.stream().forEach(item -> item.setContactTel(Sm4Utils.encrypt(item.getContactTel())));
return list;
return basicStallMapper.selectBasicStallList(basicStall);
}
/**