|
@@ -37,31 +37,31 @@ import java.util.List;
|
|
|
@RestController
|
|
@RestController
|
|
|
@RequestMapping("/app/order")
|
|
@RequestMapping("/app/order")
|
|
|
public class AppOrderController {
|
|
public class AppOrderController {
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
private static Logger log = LoggerFactory.getLogger(AppOrderController.class);
|
|
private static Logger log = LoggerFactory.getLogger(AppOrderController.class);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
@Resource
|
|
@Resource
|
|
|
private StoreOrderService storeOrderService;
|
|
private StoreOrderService storeOrderService;
|
|
|
@Resource
|
|
@Resource
|
|
|
private OrderServiceBusiness orderServiceBusiness;
|
|
private OrderServiceBusiness orderServiceBusiness;
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
@Resource
|
|
@Resource
|
|
|
private CifUserDubboServiceClient userDubboServiceClient;
|
|
private CifUserDubboServiceClient userDubboServiceClient;
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
@PostMapping("/add")
|
|
@PostMapping("/add")
|
|
|
@ApiOperation(value = "创建订单")
|
|
@ApiOperation(value = "创建订单")
|
|
|
public Result add(@Validated @RequestBody CreateOrderRequest orderRequest) {
|
|
public Result add(@Validated @RequestBody CreateOrderRequest orderRequest) {
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
if (orderRequest == null) {
|
|
if (orderRequest == null) {
|
|
|
return Result.fail(ResultCode.OBJECT_IS_NULL);
|
|
return Result.fail(ResultCode.OBJECT_IS_NULL);
|
|
|
}
|
|
}
|
|
|
Long tokenUserId = AuthService.getTokenUserId(null);
|
|
Long tokenUserId = AuthService.getTokenUserId(null);
|
|
|
- UserDTO user = userDubboServiceClient.getUser(tokenUserId);
|
|
|
|
|
- if (user.getHasOrder() != 1) {
|
|
|
|
|
- return Result.fail(ResultCode.USER_STATUS_IS_ERROR);
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
|
|
+// UserDTO user = userDubboServiceClient.getUser(tokenUserId);
|
|
|
|
|
+// if (user.getHasOrder() != 1) {
|
|
|
|
|
+// return Result.fail(ResultCode.USER_STATUS_IS_ERROR);
|
|
|
|
|
+// }
|
|
|
|
|
+
|
|
|
orderRequest.setUserId(tokenUserId);
|
|
orderRequest.setUserId(tokenUserId);
|
|
|
MyRecord record = storeOrderService.createOrder(orderRequest);
|
|
MyRecord record = storeOrderService.createOrder(orderRequest);
|
|
|
return Result.success(record);
|
|
return Result.success(record);
|
|
@@ -116,13 +116,13 @@ public class AppOrderController {
|
|
|
@PutMapping("/binding/address")
|
|
@PutMapping("/binding/address")
|
|
|
@ApiOperation(value = "订单绑定地址")
|
|
@ApiOperation(value = "订单绑定地址")
|
|
|
public Result update(@RequestBody StoreOrderUpdateParam storeOrderUpdateParam) {
|
|
public Result update(@RequestBody StoreOrderUpdateParam storeOrderUpdateParam) {
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
try {
|
|
try {
|
|
|
StoreOrder storeOrder = new StoreOrder();
|
|
StoreOrder storeOrder = new StoreOrder();
|
|
|
storeOrder.setOrderId(storeOrderUpdateParam.getOrderId());
|
|
storeOrder.setOrderId(storeOrderUpdateParam.getOrderId());
|
|
|
storeOrder.setAddressId(storeOrderUpdateParam.getAddressId());
|
|
storeOrder.setAddressId(storeOrderUpdateParam.getAddressId());
|
|
|
EasyToUseUtil.appUpdateAssignment(new Date(), storeOrder);
|
|
EasyToUseUtil.appUpdateAssignment(new Date(), storeOrder);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
storeOrderService.bindingAddress(storeOrder);
|
|
storeOrderService.bindingAddress(storeOrder);
|
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
|
log.error("更新对象操作异常e:{}", e);
|
|
log.error("更新对象操作异常e:{}", e);
|
|
@@ -130,8 +130,8 @@ public class AppOrderController {
|
|
|
}
|
|
}
|
|
|
return Result.success();
|
|
return Result.success();
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
// @GetMapping("/detail")
|
|
// @GetMapping("/detail")
|
|
|
// @ApiOperation(value = "订单获取详情")
|
|
// @ApiOperation(value = "订单获取详情")
|
|
|
// public Result<StoreOrderVO> detail(@RequestParam Long id) {
|
|
// public Result<StoreOrderVO> detail(@RequestParam Long id) {
|
|
@@ -141,20 +141,20 @@ public class AppOrderController {
|
|
|
// StoreOrderVO vo = orderServiceBusiness.orderDetail(id,null);
|
|
// StoreOrderVO vo = orderServiceBusiness.orderDetail(id,null);
|
|
|
// return Result.success(vo);
|
|
// return Result.success(vo);
|
|
|
// }
|
|
// }
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
@GetMapping("/detail")
|
|
@GetMapping("/detail")
|
|
|
@ApiOperation(value = "订单获取详情")
|
|
@ApiOperation(value = "订单获取详情")
|
|
|
public Result<StoreOrderVO> detail(@RequestParam(value = "id", required = false) Long id
|
|
public Result<StoreOrderVO> detail(@RequestParam(value = "id", required = false) Long id
|
|
|
, @RequestParam(value = "orderNo", required = false) String orderNo) {
|
|
, @RequestParam(value = "orderNo", required = false) String orderNo) {
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
if (ObjectUtils.isEmpty(orderNo)) {
|
|
if (ObjectUtils.isEmpty(orderNo)) {
|
|
|
return Result.fail(ResultCode.CODE_IS_NULL);
|
|
return Result.fail(ResultCode.CODE_IS_NULL);
|
|
|
}
|
|
}
|
|
|
StoreOrderVO vo = orderServiceBusiness.orderDetail(id, orderNo);
|
|
StoreOrderVO vo = orderServiceBusiness.orderDetail(id, orderNo);
|
|
|
return Result.success(vo);
|
|
return Result.success(vo);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
@PostMapping("/list")
|
|
@PostMapping("/list")
|
|
|
@ApiOperation(value = "订单获取列表")
|
|
@ApiOperation(value = "订单获取列表")
|
|
|
public Result<List<StoreOrderVO>> list(@RequestBody StoreOrderDTO dto) {
|
|
public Result<List<StoreOrderVO>> list(@RequestBody StoreOrderDTO dto) {
|
|
@@ -165,11 +165,11 @@ public class AppOrderController {
|
|
|
return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
|
|
return Result.fail(ResultCode.INTERNAL_SERVER_ERROR);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
@PostMapping("/app/list")
|
|
@PostMapping("/app/list")
|
|
|
@ApiOperation(value = "订单获取列表")
|
|
@ApiOperation(value = "订单获取列表")
|
|
|
public Result<List<StoreOrderVO>> appList(@RequestBody StoreOrderAppDTO dto) {
|
|
public Result<List<StoreOrderVO>> appList(@RequestBody StoreOrderAppDTO dto) {
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
Long tokenUserId = AuthService.getTokenUserId(null);
|
|
Long tokenUserId = AuthService.getTokenUserId(null);
|
|
|
dto.setUserId(tokenUserId);
|
|
dto.setUserId(tokenUserId);
|
|
|
PageHelper.startPage(dto.getPage(), dto.getSize());
|
|
PageHelper.startPage(dto.getPage(), dto.getSize());
|
|
@@ -183,13 +183,13 @@ public class AppOrderController {
|
|
|
}
|
|
}
|
|
|
return Result.success(pageInfo);
|
|
return Result.success(pageInfo);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
@ApiOperation(value = "获取订单各状态数量")
|
|
@ApiOperation(value = "获取订单各状态数量")
|
|
|
@GetMapping(value = "/status/num")
|
|
@GetMapping(value = "/status/num")
|
|
|
public Result<StoreOrderCountItemVO> getOrderStatusNum() {
|
|
public Result<StoreOrderCountItemVO> getOrderStatusNum() {
|
|
|
return Result.success(storeOrderService.getOrderStatusNum());
|
|
return Result.success(storeOrderService.getOrderStatusNum());
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
// @ApiOperation("导出订单")
|
|
// @ApiOperation("导出订单")
|
|
|
// @PostMapping("/export")
|
|
// @PostMapping("/export")
|
|
|
// public Result exportFile(@RequestBody StoreOrderDTO dto, HttpServletResponse response) {
|
|
// public Result exportFile(@RequestBody StoreOrderDTO dto, HttpServletResponse response) {
|
|
@@ -203,7 +203,7 @@ public class AppOrderController {
|
|
|
// storeOrderService.refund(id);
|
|
// storeOrderService.refund(id);
|
|
|
// return Result.success();
|
|
// return Result.success();
|
|
|
// }
|
|
// }
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
@ApiOperation("关闭订单")
|
|
@ApiOperation("关闭订单")
|
|
|
@PostMapping("/close")
|
|
@PostMapping("/close")
|
|
|
public Result close(@RequestParam("orderNo") String orderNo) {
|
|
public Result close(@RequestParam("orderNo") String orderNo) {
|
|
@@ -213,7 +213,7 @@ public class AppOrderController {
|
|
|
storeOrderService.close(orderNo);
|
|
storeOrderService.close(orderNo);
|
|
|
return Result.success();
|
|
return Result.success();
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
@ApiOperation("取消订单")
|
|
@ApiOperation("取消订单")
|
|
|
@PostMapping("/cancel")
|
|
@PostMapping("/cancel")
|
|
|
public Result cancel(@RequestParam("orderNo") String orderNo) {
|
|
public Result cancel(@RequestParam("orderNo") String orderNo) {
|
|
@@ -223,79 +223,79 @@ public class AppOrderController {
|
|
|
storeOrderService.cancel(orderNo);
|
|
storeOrderService.cancel(orderNo);
|
|
|
return Result.success();
|
|
return Result.success();
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
@ApiOperation("联系用户")
|
|
@ApiOperation("联系用户")
|
|
|
@PostMapping("/contactUser")
|
|
@PostMapping("/contactUser")
|
|
|
public Result contactUser(@RequestParam("userId") Long userId) {
|
|
public Result contactUser(@RequestParam("userId") Long userId) {
|
|
|
// storeOrderService.contactUser(userId);
|
|
// storeOrderService.contactUser(userId);
|
|
|
return Result.success();
|
|
return Result.success();
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
// @ApiOperation("批量发货")
|
|
// @ApiOperation("批量发货")
|
|
|
// @PostMapping("/batchDelivery")
|
|
// @PostMapping("/batchDelivery")
|
|
|
// public Result batchDelivery(@RequestBody List<StoreOrderDeliveryDTO> list) {
|
|
// public Result batchDelivery(@RequestBody List<StoreOrderDeliveryDTO> list) {
|
|
|
// storeOrderService.batchDelivery(list);
|
|
// storeOrderService.batchDelivery(list);
|
|
|
// return Result.success();
|
|
// return Result.success();
|
|
|
// }
|
|
// }
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
@ApiOperation(value = "预下单")
|
|
@ApiOperation(value = "预下单")
|
|
|
@PostMapping(value = "/pre/order")
|
|
@PostMapping(value = "/pre/order")
|
|
|
public Result preOrder(@RequestBody @Validated PreOrderRequest request) {
|
|
public Result preOrder(@RequestBody @Validated PreOrderRequest request) {
|
|
|
Long tokenUserId = AuthService.getTokenUserId(null);
|
|
Long tokenUserId = AuthService.getTokenUserId(null);
|
|
|
request.setUserId(tokenUserId);
|
|
request.setUserId(tokenUserId);
|
|
|
return Result.success(storeOrderService.preOrder(request));
|
|
return Result.success(storeOrderService.preOrder(request));
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
@ApiOperation(value = "加载预下单")
|
|
@ApiOperation(value = "加载预下单")
|
|
|
@PostMapping(value = "load/pre")
|
|
@PostMapping(value = "load/pre")
|
|
|
public Result<PreOrderResponse> loadPreOrder(@RequestParam String preOrderNo) {
|
|
public Result<PreOrderResponse> loadPreOrder(@RequestParam String preOrderNo) {
|
|
|
if (ObjectUtils.isEmpty(preOrderNo)) {
|
|
if (ObjectUtils.isEmpty(preOrderNo)) {
|
|
|
return Result.fail(ResultCode.CODE_IS_NULL);
|
|
return Result.fail(ResultCode.CODE_IS_NULL);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
Long tokenUserId = AuthService.getTokenUserId(null);
|
|
Long tokenUserId = AuthService.getTokenUserId(null);
|
|
|
return Result.success(storeOrderService.loadPreOrder(preOrderNo));
|
|
return Result.success(storeOrderService.loadPreOrder(preOrderNo));
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
@ApiOperation(value = "计算订单价格")
|
|
@ApiOperation(value = "计算订单价格")
|
|
|
@PostMapping(value = "/computed/price")
|
|
@PostMapping(value = "/computed/price")
|
|
|
public Result<ComputedOrderPriceResponse> computedPrice(@Validated @RequestBody OrderComputedPriceRequest request) {
|
|
public Result<ComputedOrderPriceResponse> computedPrice(@Validated @RequestBody OrderComputedPriceRequest request) {
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
Long tokenUserId = AuthService.getTokenUserId(null);
|
|
Long tokenUserId = AuthService.getTokenUserId(null);
|
|
|
request.setUserId(tokenUserId);
|
|
request.setUserId(tokenUserId);
|
|
|
return Result.success(storeOrderService.computedOrderPrice(request));
|
|
return Result.success(storeOrderService.computedOrderPrice(request));
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
@ApiOperation(value = "去支付")
|
|
@ApiOperation(value = "去支付")
|
|
|
@PostMapping(value = "/goPay")
|
|
@PostMapping(value = "/goPay")
|
|
|
public Result getPayResult(@RequestBody GoPinkDTO dto) {
|
|
public Result getPayResult(@RequestBody GoPinkDTO dto) {
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
Long tokenUserId = AuthService.getTokenUserId(null);
|
|
Long tokenUserId = AuthService.getTokenUserId(null);
|
|
|
dto.setUserId(tokenUserId);
|
|
dto.setUserId(tokenUserId);
|
|
|
return storeOrderService.goPay(dto);
|
|
return storeOrderService.goPay(dto);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
// @ApiOperation("导出发货单")
|
|
// @ApiOperation("导出发货单")
|
|
|
// @PostMapping("/exportDelivery")
|
|
// @PostMapping("/exportDelivery")
|
|
|
// public Result exportDelivery(HttpServletResponse response) {
|
|
// public Result exportDelivery(HttpServletResponse response) {
|
|
|
// storeOrderService.exportDelivery(response);
|
|
// storeOrderService.exportDelivery(response);
|
|
|
// return Result.success();
|
|
// return Result.success();
|
|
|
// }
|
|
// }
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
// @ApiOperation("导入发货单")
|
|
// @ApiOperation("导入发货单")
|
|
|
// @PostMapping("/importDelivery")
|
|
// @PostMapping("/importDelivery")
|
|
|
// public Result importDelivery(@JSONField(serialize = false) @RequestParam("file") MultipartFile file) {
|
|
// public Result importDelivery(@JSONField(serialize = false) @RequestParam("file") MultipartFile file) {
|
|
|
// storeOrderService.importDelivery(file);
|
|
// storeOrderService.importDelivery(file);
|
|
|
// return Result.success();
|
|
// return Result.success();
|
|
|
// }
|
|
// }
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
@ApiOperation("待处理红点数")
|
|
@ApiOperation("待处理红点数")
|
|
|
@GetMapping("/pendingRedDots")
|
|
@GetMapping("/pendingRedDots")
|
|
|
public Result pendingRedDots() {
|
|
public Result pendingRedDots() {
|
|
|
return Result.success(storeOrderService.pendingRedDots());
|
|
return Result.success(storeOrderService.pendingRedDots());
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
}
|
|
}
|