|
|
|
@ -4,7 +4,9 @@ import cc.hiver.core.common.constant.CommonConstant; |
|
|
|
import cc.hiver.core.common.constant.WorkerConstant; |
|
|
|
import cc.hiver.core.common.utils.BeanUtils; |
|
|
|
import cc.hiver.core.common.utils.ResultUtil; |
|
|
|
import cc.hiver.core.common.utils.SecurityUtil; |
|
|
|
import cc.hiver.core.common.vo.Result; |
|
|
|
import cc.hiver.core.entity.User; |
|
|
|
import cc.hiver.core.entity.Worker; |
|
|
|
import cc.hiver.core.service.WorkerService; |
|
|
|
import cc.hiver.core.vo.WorkerAppVO; |
|
|
|
@ -57,6 +59,9 @@ public class WorkerController { |
|
|
|
@Autowired |
|
|
|
private WorkerRelaPriceMapper workerRelaPriceMapper; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private SecurityUtil securityUtil; |
|
|
|
|
|
|
|
@RequestMapping(value = "/getByCondition", method = RequestMethod.POST) |
|
|
|
@ApiOperation(value = "多条件分页获取订单列表") |
|
|
|
public Result<Page<Worker>> getByCondition(@RequestBody WorkerQueryVO worker) { |
|
|
|
@ -91,33 +96,32 @@ public class WorkerController { |
|
|
|
} |
|
|
|
|
|
|
|
@RequestMapping(value = "/admin/add", method = RequestMethod.POST) |
|
|
|
@ApiOperation(value = "创建配送员") |
|
|
|
public Result add(@Valid Worker u) { |
|
|
|
|
|
|
|
// 添加商圈名称
|
|
|
|
if (StrUtil.isNotBlank(u.getRegion())) { |
|
|
|
ShopArea d = shopAreaService.get(u.getRegion()); |
|
|
|
if (d != null) { |
|
|
|
u.setRegionTitle(d.getTitle()); |
|
|
|
@ApiOperation(value = "创建配送员或切换校区") |
|
|
|
public Result<Worker> add(@Valid Worker u) { |
|
|
|
final User user = securityUtil.getCurrUser(); |
|
|
|
Worker worker = workerService.findByUserId(user.getId()); |
|
|
|
if(worker != null){ |
|
|
|
if(u.getRegion().equals(worker.getRegion())){ |
|
|
|
return new ResultUtil<Worker>().setData(worker); |
|
|
|
}else{ |
|
|
|
worker.setRegion(u.getRegion()); |
|
|
|
workerService.update(worker); |
|
|
|
return new ResultUtil<Worker>().setData(worker); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
if(u.getIsChangeArea() != null && u.getIsChangeArea() == 0){ |
|
|
|
return new ResultUtil<Worker>().setData(worker); |
|
|
|
}else{ |
|
|
|
u.setWorkerName(user.getNickname()); |
|
|
|
u.setUserId(user.getId()); |
|
|
|
u.setAvgTime(BigDecimal.valueOf(30)); |
|
|
|
u.setMobile(user.getMobile()); |
|
|
|
u.setIsOnLine(CommonConstant.OFF_LINE); |
|
|
|
u.setScore(BigDecimal.valueOf(5)); |
|
|
|
workerService.save(u); |
|
|
|
return new ResultUtil<Worker>().setData(u); |
|
|
|
} |
|
|
|
} else { |
|
|
|
u.setRegion(null); |
|
|
|
u.setRegionTitle(""); |
|
|
|
} |
|
|
|
//更新充值记录
|
|
|
|
Recharge recharge = new Recharge(); |
|
|
|
|
|
|
|
recharge.setRechargeName(u.getWorkerName()); |
|
|
|
recharge.setRechargeWorkerId(u.getWorkerId()); |
|
|
|
recharge.setMobile(u.getMobile()); |
|
|
|
|
|
|
|
rechargeService.save(recharge); |
|
|
|
|
|
|
|
//更新余额，重置当次应缴
|
|
|
|
u.setIsOnLine(CommonConstant.ON_LINE); |
|
|
|
workerService.save(u); |
|
|
|
|
|
|
|
return ResultUtil.success("创建成功"); |
|
|
|
} |
|
|
|
|
|
|
|
@RequestMapping(value = "/admin/edit", method = RequestMethod.POST) |
|
|
|
|
wangfukang
4 weeks ago