Skip to content

C
cloud-platform
Commit 554587d4 authored by unset's avatar unset
Browse files
Options

订单核销接口修改

parent da9237fb
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 6 deletions
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/OrderViolationController.java
View file @ 554587d4
...@@ -2,7 +2,7 @@ package com.xxfc.platform.order.rest; ...@@ -2,7 +2,7 @@ package com.xxfc.platform.order.rest;
import com.github.wxiaoqi.security.admin.feign.UserFeign; import com.github.wxiaoqi.security.admin.feign.UserFeign;
import com.github.wxiaoqi.security.admin.feign.dto.UserDTO; import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface; import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
import com.github.wxiaoqi.security.common.exception.BaseException; import com.github.wxiaoqi.security.common.exception.BaseException;
import com.github.wxiaoqi.security.common.msg.ObjectRestResponse; import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
...@@ -58,18 +58,21 @@ public class OrderViolationController extends BaseController<OrderViolationBiz, ...@@ -58,18 +58,21 @@ public class OrderViolationController extends BaseController<OrderViolationBiz,
@PostMapping("/saveOrderViolation") @PostMapping("/saveOrderViolation")
public ObjectRestResponse saveOrderViolation(@RequestBody OrderViolation orderViolation, HttpServletRequest request) { public ObjectRestResponse saveOrderViolation(@RequestBody OrderViolation orderViolation, HttpServletRequest request) {
log.info("保存违章记录：orderViolation = {}", orderViolation.toString()); log.info("保存违章记录：orderViolation = {}", orderViolation.toString());
UserDTO userDTOD = getBusinessUserByAppUser(); AppUserDTO userDTO = userFeign.userDetailByToken(request.getHeader("Authorization")).getData();
if (userDTO == null) {
return ObjectRestResponse.createFailedResult(ResultCode.RSTOKEN_EXPIRED_CODE, "token is null or invalid");
}
if (orderViolation.getId() == null) { if (orderViolation.getId() == null) {
orderViolation.setIsDel(0); orderViolation.setIsDel(0);
orderViolation.setCrtHost(request.getRemoteHost()); orderViolation.setCrtHost(request.getRemoteHost());
orderViolation.setCrtName(userDTOD.getName()); orderViolation.setCrtName(userDTO.getRealname());
orderViolation.setCrtUserId(userDTOD.getId()); orderViolation.setCrtUserId(userDTO.getId());
orderViolation.setCrtTime(new BigInteger(String.valueOf(System.currentTimeMillis()))); orderViolation.setCrtTime(new BigInteger(String.valueOf(System.currentTimeMillis())));
getBaseBiz().insertOrderViolation(orderViolation); getBaseBiz().insertOrderViolation(orderViolation);
} else { } else {
orderViolation.setUpdHost(request.getRemoteHost()); orderViolation.setUpdHost(request.getRemoteHost());
orderViolation.setUpdName(userDTOD.getName()); orderViolation.setUpdName(userDTO.getRealname());
orderViolation.setUpdUserId(userDTOD.getId()); orderViolation.setUpdUserId(userDTO.getId());
orderViolation.setUpdTime(new BigInteger(String.valueOf(System.currentTimeMillis()))); orderViolation.setUpdTime(new BigInteger(String.valueOf(System.currentTimeMillis())));
getBaseBiz().updateOrderViolation(orderViolation); getBaseBiz().updateOrderViolation(orderViolation);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment