企业预约
This commit is contained in:
parent
8b558ea62b
commit
76799c62ab
|
@ -333,6 +333,15 @@ public class ArtificerController {
|
||||||
return ordersService.updateArtificerCreditScore(type, creditScore, artificerId);
|
return ordersService.updateArtificerCreditScore(type, creditScore, artificerId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@PostMapping("/updateArtificerCity")
|
||||||
|
@ApiOperation("修改技师城市")
|
||||||
|
public Result updateArtificerCity(String city, Long artificerId){
|
||||||
|
Artificer artificer = artificerService.getById(artificerId);
|
||||||
|
artificer.setCity(city);
|
||||||
|
artificerService.updateById(artificer);
|
||||||
|
return Result.success();
|
||||||
|
}
|
||||||
|
|
||||||
@Scheduled(cron = "0 */1 * * * ?")
|
@Scheduled(cron = "0 */1 * * * ?")
|
||||||
public void endOrders(){
|
public void endOrders(){
|
||||||
ordersService.endOrders();
|
ordersService.endOrders();
|
||||||
|
|
|
@ -8,6 +8,7 @@ import lombok.Data;
|
||||||
|
|
||||||
import java.io.Serializable;
|
import java.io.Serializable;
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description massage_package
|
* @description massage_package
|
||||||
|
@ -202,5 +203,8 @@ public class MassagePackage implements Serializable {
|
||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
private Integer limit;
|
private Integer limit;
|
||||||
|
|
||||||
|
@TableField(exist = false)
|
||||||
|
List<MassagePackageDetail> massagePackageDetailList;
|
||||||
|
|
||||||
public MassagePackage() {}
|
public MassagePackage() {}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
package com.sqx.modules.bl.massage.service.impl;
|
package com.sqx.modules.bl.massage.service.impl;
|
||||||
|
|
||||||
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
||||||
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||||
import com.sqx.common.utils.DateUtils;
|
import com.sqx.common.utils.DateUtils;
|
||||||
|
@ -7,6 +9,8 @@ import com.sqx.common.utils.PageUtils;
|
||||||
import com.sqx.common.utils.Result;
|
import com.sqx.common.utils.Result;
|
||||||
import com.sqx.modules.app.entity.UserEntity;
|
import com.sqx.modules.app.entity.UserEntity;
|
||||||
import com.sqx.modules.app.service.UserService;
|
import com.sqx.modules.app.service.UserService;
|
||||||
|
import com.sqx.modules.artificer.entity.Artificer;
|
||||||
|
import com.sqx.modules.artificer.entity.ArtificerTime;
|
||||||
import com.sqx.modules.bl.collect.entity.CollectMassage;
|
import com.sqx.modules.bl.collect.entity.CollectMassage;
|
||||||
import com.sqx.modules.bl.collect.service.CollectMassageService;
|
import com.sqx.modules.bl.collect.service.CollectMassageService;
|
||||||
import com.sqx.modules.bl.massage.dao.MassagePackageDao;
|
import com.sqx.modules.bl.massage.dao.MassagePackageDao;
|
||||||
|
@ -42,7 +46,13 @@ public class MassagePackageServiceImpl extends ServiceImpl<MassagePackageDao, Ma
|
||||||
@Override
|
@Override
|
||||||
public Result findPage(MassagePackage massagePackage){
|
public Result findPage(MassagePackage massagePackage){
|
||||||
Page<MassagePackage> pages=new Page<>(massagePackage.getPage(),massagePackage.getLimit());
|
Page<MassagePackage> pages=new Page<>(massagePackage.getPage(),massagePackage.getLimit());
|
||||||
return Result.success().put("data",new PageUtils(baseMapper.findPage(pages,massagePackage)));
|
IPage iPage = baseMapper.findPage(pages,massagePackage);
|
||||||
|
List<MassagePackage> records = iPage.getRecords();
|
||||||
|
for(MassagePackage record:records){
|
||||||
|
List<MassagePackageDetail> massagePackageDetailList = massagePackageDetailDao.selectList(new QueryWrapper<MassagePackageDetail>().eq("main_id", massagePackage.getId()));
|
||||||
|
record.setMassagePackageDetailList(massagePackageDetailList);
|
||||||
|
}
|
||||||
|
return Result.success().put("data",new PageUtils(iPage));
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -42,6 +42,12 @@ public class TripController {
|
||||||
return Result.success().put("data",new PageUtils(tripService.page(new Page<>(page,limit),new QueryWrapper<Trip>().like(StringUtils.isNotBlank(city),"city",city))));
|
return Result.success().put("data",new PageUtils(tripService.page(new Page<>(page,limit),new QueryWrapper<Trip>().like(StringUtils.isNotBlank(city),"city",city))));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@GetMapping("/selectCityList")
|
||||||
|
@ApiOperation("查询开放城市列表")
|
||||||
|
public Result selectTripList(){
|
||||||
|
return Result.success().put("data",tripService.list(new QueryWrapper<Trip>()));
|
||||||
|
}
|
||||||
|
|
||||||
@PostMapping("/insertTrip")
|
@PostMapping("/insertTrip")
|
||||||
@ApiOperation("添加出行方式")
|
@ApiOperation("添加出行方式")
|
||||||
public Result insertTrip(@RequestBody Trip trip){
|
public Result insertTrip(@RequestBody Trip trip){
|
||||||
|
|
Loading…
Reference in New Issue