Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
35f8f2db07
|
|
@ -36,15 +36,7 @@ public class AppAccV4Controller extends BaseController {
|
||||||
)
|
)
|
||||||
@PostMapping({"/wallet/balance"})
|
@PostMapping({"/wallet/balance"})
|
||||||
public AjaxResult queryWalletBalance(@RequestBody AppAccInfoV4DTO o) {
|
public AjaxResult queryWalletBalance(@RequestBody AppAccInfoV4DTO o) {
|
||||||
try {
|
|
||||||
if (StringUtils.isBlank(String.valueOf(o.getCustId()))) {
|
|
||||||
return error("食堂ID不能为空");
|
|
||||||
}
|
|
||||||
return success(this.appAccV4Service.queryWalletBalance(o));
|
return success(this.appAccV4Service.queryWalletBalance(o));
|
||||||
} catch (Exception e) {
|
|
||||||
log.error(e.toString(), e);
|
|
||||||
return error("查询账户失败");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ApiOperation(
|
@ApiOperation(
|
||||||
|
|
@ -53,14 +45,6 @@ public class AppAccV4Controller extends BaseController {
|
||||||
)
|
)
|
||||||
@PostMapping({"/info"})
|
@PostMapping({"/info"})
|
||||||
public AjaxResult queryAccInfoForApp(@RequestBody AppAccInfoV4DTO o) {
|
public AjaxResult queryAccInfoForApp(@RequestBody AppAccInfoV4DTO o) {
|
||||||
try {
|
|
||||||
if (StringUtils.isBlank(String.valueOf(o.getCustId()))) {
|
|
||||||
return error("食堂ID不能为空");
|
|
||||||
}
|
|
||||||
return success(this.appAccV4Service.queryAccInfoForApp(o));
|
return success(this.appAccV4Service.queryAccInfoForApp(o));
|
||||||
} catch (Exception e) {
|
|
||||||
log.error(e.toString(), e);
|
|
||||||
return error("查询账户失败");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -36,27 +36,7 @@ public class MenuEvaluaOrderController {
|
||||||
@RequiresGuest
|
@RequiresGuest
|
||||||
@ApiOperation("获取指定餐品的评价列表")
|
@ApiOperation("获取指定餐品的评价列表")
|
||||||
public AjaxResult getMenuEvaluaOrderPageByMeal(@RequestBody @Valid MenuEvaluaOrderPageMealDTO dto) {
|
public AjaxResult getMenuEvaluaOrderPageByMeal(@RequestBody @Valid MenuEvaluaOrderPageMealDTO dto) {
|
||||||
try {
|
|
||||||
if (StringUtils.isBlank(String.valueOf(dto.getMealId()))) {
|
|
||||||
return AjaxResult.error("餐品ID不能为空");
|
|
||||||
}
|
|
||||||
if (StringUtils.isBlank(String.valueOf(dto.getCurrent()))) {
|
|
||||||
return AjaxResult.error("页码不能为空");
|
|
||||||
}
|
|
||||||
if (StringUtils.isBlank(String.valueOf(dto.getSize()))) {
|
|
||||||
return AjaxResult.error("每页数量不能为空");
|
|
||||||
}
|
|
||||||
if (StringUtils.isBlank(String.valueOf(dto.getShopstallId()))) {
|
|
||||||
return AjaxResult.error("档口ID不能为空");
|
|
||||||
}
|
|
||||||
if (StringUtils.isBlank(String.valueOf(dto.getMealType()))){
|
|
||||||
return AjaxResult.error("餐品类型不能为空");
|
|
||||||
}
|
|
||||||
return AjaxResult.success(this.menuEvaluaOrderService.getMenuEvaluaOrderPageByMeal(dto));
|
return AjaxResult.success(this.menuEvaluaOrderService.getMenuEvaluaOrderPageByMeal(dto));
|
||||||
} catch (Exception e) {
|
|
||||||
log.error(e.toString(), e);
|
|
||||||
return AjaxResult.error("获取指定餐品的评价列表失败");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping({"/add"})
|
@PostMapping({"/add"})
|
||||||
|
|
|
||||||
|
|
@ -50,25 +50,17 @@ public class AppletInformController extends BaseController {
|
||||||
@RequiresGuest
|
@RequiresGuest
|
||||||
@ApiOperation("获取未读消息数量")
|
@ApiOperation("获取未读消息数量")
|
||||||
public AjaxResult queryUnreadInformNum(@RequestBody InformHistoryAppletPageDTO dto) {
|
public AjaxResult queryUnreadInformNum(@RequestBody InformHistoryAppletPageDTO dto) {
|
||||||
try {
|
|
||||||
return AjaxResult.success(this.informRangeService.queryUnreadInformNum(dto.getCustId()));
|
return AjaxResult.success(this.informRangeService.queryUnreadInformNum(dto.getCustId()));
|
||||||
} catch (Exception e) {
|
|
||||||
return AjaxResult.error("获取未读消息数量失败");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@PostMapping({"/updateStatus"})
|
@PostMapping({"/updateStatus"})
|
||||||
@RequiresGuest
|
@RequiresGuest
|
||||||
@ApiOperation("修改通知状态")
|
@ApiOperation("修改通知状态")
|
||||||
public AjaxResult updateWhether(@RequestBody @Valid InformRangeUpdateWhetherDTO dto) {
|
public AjaxResult updateWhether(@RequestBody @Valid InformRangeUpdateWhetherDTO dto) {
|
||||||
try {
|
|
||||||
int count = this.informRangeService.updateWhether(dto);
|
int count = this.informRangeService.updateWhether(dto);
|
||||||
if (count == 0) {
|
if (count == 0) {
|
||||||
return AjaxResult.error("修改通知状态失败");
|
return AjaxResult.error("修改通知状态失败");
|
||||||
}
|
}
|
||||||
return AjaxResult.success("修改通知状态成功");
|
return AjaxResult.success("修改通知状态成功");
|
||||||
} catch (Exception e) {
|
|
||||||
return AjaxResult.error("修改通知状态失败");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Reference in New Issue