|
|
|
@@ -52,9 +52,9 @@ public class WxCreditHistoryController extends BaseController |
|
|
|
@PostMapping("add") |
|
|
|
public ResultData add(@RequestBody WxCreditHistory wxCreditHistory) { |
|
|
|
logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::add"); |
|
|
|
<<<<<<< HEAD |
|
|
|
wxCreditHistory.setTenantId(getTenantId()); |
|
|
|
wxCreditHistory.setOperatorId(getUser().getId()); |
|
|
|
MallUserInfo user = getUser(); |
|
|
|
wxCreditHistory.setTenantId(user.getTenantId()); |
|
|
|
wxCreditHistory.setOperatorId(user.getId()); |
|
|
|
try { |
|
|
|
WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); |
|
|
|
return new ResultData(Result.SUCCESS, "操作成功", credit); |
|
|
|
@@ -62,13 +62,6 @@ public class WxCreditHistoryController extends BaseController |
|
|
|
logger.error(e.getMessage()); |
|
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
|
} |
|
|
|
======= |
|
|
|
MallUserInfo user = getUser(); |
|
|
|
wxCreditHistory.setTenantId(user.getTenantId()); |
|
|
|
wxCreditHistory.setOperatorId(user.getId()); |
|
|
|
WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); |
|
|
|
return new ResultData(Result.SUCCESS,"操作成功",credit); |
|
|
|
>>>>>>> [getUser][修改]:重整 |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("根据id查询接口") |
|
|
|
|