店铺(即师傅-商品)详情的查询接口
This commit is contained in:
parent
6a92f40b51
commit
7f907a3863
|
|
@ -22,6 +22,7 @@ import com.ghy.worker.service.WorkerService;
|
|||
import com.ghy.worker.service.WorkerSpecialSkillService;
|
||||
import org.apache.commons.collections.CollectionUtils;
|
||||
import org.apache.shiro.authz.annotation.RequiresPermissions;
|
||||
import org.apache.shiro.util.Assert;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Controller;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
|
@ -69,6 +70,7 @@ public class WorkerController extends BaseController {
|
|||
{
|
||||
List<WorkerListResponse> resList = new ArrayList<WorkerListResponse>();
|
||||
|
||||
try {
|
||||
// 查询满足区域条件的师傅区域记录
|
||||
WorkerArea workerArea = new WorkerArea();
|
||||
workerArea.setDistrictId(workerListRequest.getAreaId());
|
||||
|
|
@ -103,10 +105,41 @@ public class WorkerController extends BaseController {
|
|||
workerListResponse.setSpecialSkills(specialSkillService.getByWorker(w.getWorkerId()));
|
||||
resList.add(workerListResponse);
|
||||
});
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
logger.error(ExceptionUtil.getExceptionMessage(e));
|
||||
}
|
||||
|
||||
return getDataTable(resList);
|
||||
}
|
||||
|
||||
@PostMapping("/getDetailById")
|
||||
@ResponseBody
|
||||
public AjaxResult getDetailById(@RequestBody WorkerListRequest workerListRequest)
|
||||
{
|
||||
WorkerListResponse workerListResponse = new WorkerListResponse();
|
||||
|
||||
try {
|
||||
Assert.notNull(workerListRequest.getWorkerId(), "Worker id can not be null");
|
||||
|
||||
Worker worker = workerService.selectById(workerListRequest.getWorkerId());
|
||||
Goods goods = new Goods();
|
||||
goods.setWorkerId(workerListRequest.getWorkerId());
|
||||
goods.setStatus(Integer.valueOf(GoodsStatus.OK.getCode()));
|
||||
workerListResponse = JSONObject.parseObject(JSON.toJSONString(worker), WorkerListResponse.class);
|
||||
workerListResponse.setGoodsList(goodsService.selectGoodsList(goods));
|
||||
workerListResponse.setWorkerAreas(workerAreaService.getByWorker(worker.getWorkerId()));
|
||||
workerListResponse.setGoodsCategories(workerGoodsCategoryService.getByWorker(worker.getWorkerId()));
|
||||
workerListResponse.setSpecialSkills(specialSkillService.getByWorker(worker.getWorkerId()));
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
logger.error(ExceptionUtil.getExceptionMessage(e));
|
||||
return AjaxResult.error(e.getMessage());
|
||||
}
|
||||
|
||||
return AjaxResult.success(workerListResponse);
|
||||
}
|
||||
|
||||
@PostMapping("/update")
|
||||
@ResponseBody
|
||||
public AjaxResult updateWorker(@RequestBody Worker worker){
|
||||
|
|
|
|||
|
|
@ -14,4 +14,6 @@ public class WorkerListRequest {
|
|||
private Long goodsCategoryId;
|
||||
|
||||
private String workerName;
|
||||
|
||||
private Long workerId;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue