Skip to content

P
peizhen-java
Commit de71f825 by 邹磊浩
Options

Merge remote-tracking branch 'origin/dev' into dev 

# Conflicts:
#	pz-applet/src/main/java/com/pz/applet/AppletServicesController.java
#	pz-system/src/main/java/com/pz/system/service/impl/ServicesServiceImpl.java
parents 04b6487e cc490f99
Showing with 10 additions and 17 deletions
pz-applet/src/main/java/com/pz/applet/AppletServicesController.java
package com.pz.applet; package com.pz.applet;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import com.pz.applet.util.CityIdUtils;
import com.pz.common.annotation.Log; import com.pz.common.annotation.Log;
import com.pz.common.annotation.RepeatSubmit; import com.pz.common.annotation.RepeatSubmit;
import com.pz.common.core.controller.BaseController; import com.pz.common.core.controller.BaseController;
...@@ -19,7 +18,6 @@ import lombok.RequiredArgsConstructor; ...@@ -19,7 +18,6 @@ import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
......
pz-merchant/src/main/java/com/pz/merchant/controller/applet/CompanyController.java
package com.pz.merchant.controller.applet; package com.pz.merchant.controller.applet;
import cn.dev33.satoken.annotation.SaIgnore;
import com.dtflys.forest.annotation.Get;
import com.pz.common.core.controller.BaseController; import com.pz.common.core.controller.BaseController;
import com.pz.common.core.domain.PageQuery; import com.pz.common.core.domain.PageQuery;
import com.pz.common.core.domain.R; import com.pz.common.core.domain.R;
import com.pz.common.core.domain.model.LoginUser;
import com.pz.common.core.validate.EditGroup; import com.pz.common.core.validate.EditGroup;
import com.pz.common.helper.LoginHelper;
import com.pz.merchant.domain.bo.CompanyBalanceBo; import com.pz.merchant.domain.bo.CompanyBalanceBo;
import com.pz.merchant.domain.bo.ModifyCompanyInfoBo; import com.pz.merchant.domain.bo.ModifyCompanyInfoBo;
import com.pz.merchant.domain.vo.CompanyAppVo; import com.pz.merchant.domain.vo.CompanyAppVo;
......
pz-system/src/main/java/com/pz/system/domain/bo/ServicesBo.java
...@@ -85,5 +85,4 @@ public class ServicesBo extends BaseEntity { ...@@ -85,5 +85,4 @@ public class ServicesBo extends BaseEntity {
*/ */
private String info; private String info;
} }
pz-system/src/main/java/com/pz/system/service/impl/ServicesServiceImpl.java
package com.pz.system.service.impl; package com.pz.system.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.pz.common.core.page.TableDataInfo; import com.pz.common.core.page.TableDataInfo;
import com.pz.common.core.domain.PageQuery; import com.pz.common.core.domain.PageQuery;
...@@ -18,7 +17,10 @@ import com.pz.system.domain.Services; ...@@ -18,7 +17,10 @@ import com.pz.system.domain.Services;
import com.pz.system.mapper.ServicesMapper; import com.pz.system.mapper.ServicesMapper;
import com.pz.system.service.IServicesService; import com.pz.system.service.IServicesService;
import java.util.*; import java.util.List;
import java.util.Map;
import java.util.Collection;
import java.util.Optional;
/** /**
* 服务Service业务层处理 * 服务Service业务层处理
...@@ -49,11 +51,9 @@ public class ServicesServiceImpl implements IServicesService { ...@@ -49,11 +51,9 @@ public class ServicesServiceImpl implements IServicesService {
public TableDataInfo<ServicesVo> queryPageList(ServicesBo bo, PageQuery pageQuery) { public TableDataInfo<ServicesVo> queryPageList(ServicesBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<Services> lqw = buildQueryWrapper(bo); LambdaQueryWrapper<Services> lqw = buildQueryWrapper(bo);
Page<ServicesVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); Page<ServicesVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
Optional.ofNullable(result.getRecords()).ifPresent(records -> { result.getRecords().stream().findFirst().ifPresent(service -> {
List<Notice> notices = noticeMapper.selectList(new LambdaQueryWrapper<Notice>().eq(Notice::getSite, 2)); noticeMapper.selectList(new LambdaQueryWrapper<Notice>().eq(Notice::getSite, 2))
if (null != notices && notices.size() != 0) { .stream().findFirst().ifPresent(notices -> service.setNotice(notices.getInfo()));
records.get(0).setNotice(notices.get(0).getInfo());
}
}); });
return TableDataInfo.build(result); return TableDataInfo.build(result);
} }
...@@ -73,7 +73,7 @@ public class ServicesServiceImpl implements IServicesService { ...@@ -73,7 +73,7 @@ public class ServicesServiceImpl implements IServicesService {
lqw.eq(bo.getBid() != null, Services::getBid, bo.getBid()); lqw.eq(bo.getBid() != null, Services::getBid, bo.getBid());
lqw.like(StringUtils.isNotBlank(bo.getName()), Services::getName, bo.getName()); lqw.like(StringUtils.isNotBlank(bo.getName()), Services::getName, bo.getName());
lqw.eq(StringUtils.isNotBlank(bo.getCover()), Services::getCover, bo.getCover()); lqw.eq(StringUtils.isNotBlank(bo.getCover()), Services::getCover, bo.getCover());
lqw.eq(ObjectUtils.isNotEmpty(bo.getCityId()), Services::getCityId, bo.getCityId()); lqw.eq(bo.getCityId() != null, Services::getCityId, bo.getCityId());
lqw.eq(bo.getFenmo() != null, Services::getFenmo, bo.getFenmo()); lqw.eq(bo.getFenmo() != null, Services::getFenmo, bo.getFenmo());
lqw.eq(bo.getDuration() != null, Services::getDuration, bo.getDuration()); lqw.eq(bo.getDuration() != null, Services::getDuration, bo.getDuration());
lqw.eq(bo.getOvertime() != null, Services::getOvertime, bo.getOvertime()); lqw.eq(bo.getOvertime() != null, Services::getOvertime, bo.getOvertime());
...@@ -110,7 +110,7 @@ public class ServicesServiceImpl implements IServicesService { ...@@ -110,7 +110,7 @@ public class ServicesServiceImpl implements IServicesService {
/** /**
* 保存前的数据校验 * 保存前的数据校验
*/ */
private void validEntityBeforeSave(Services entity) { private void validEntityBeforeSave(Services entity){
//TODO 做一些数据校验,如唯一约束 //TODO 做一些数据校验,如唯一约束
} }
...@@ -119,7 +119,7 @@ public class ServicesServiceImpl implements IServicesService { ...@@ -119,7 +119,7 @@ public class ServicesServiceImpl implements IServicesService {
*/ */
@Override @Override
public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) { public Boolean deleteWithValidByIds(Collection<Integer> ids, Boolean isValid) {
if (isValid) { if(isValid){
//TODO 做一些业务上的校验,判断是否需要校验 //TODO 做一些业务上的校验,判断是否需要校验
} }
return baseMapper.deleteBatchIds(ids) > 0; return baseMapper.deleteBatchIds(ids) > 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment