订单信息

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java

@@ -542,15 +542,14 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 
 	/**
 	 * 取消订单
-	 * @param orderId
-	 * @param remark
+	 * @param param
 	 * @return
 	 */
-	public ObjectRestResponse cancelOrder(Long orderId, String remark) {
-		if (orderId == null) {
+	public ObjectRestResponse cancelOrder(OrderInfo param) {
+		if (param == null || param.getOrderId() == null) {
 			return ObjectRestResponse.paramIsEmpty();
 		}
-		OrderInfo orderInfo = selectById(orderId);
+		OrderInfo orderInfo = selectById(param.getOrderId());
 		if (orderInfo == null || orderInfo.getStatus().equals(OrderStatusEnum.ORDER_DELETE.getType())) {
 			return ObjectRestResponse.createFailedResult(ResultCode.ORDER_NOT_EXIST, ResultCode.getMsg(ResultCode.ORDER_NOT_EXIST));
 		}
@@ -564,8 +563,8 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 		} else if (orderInfo.getStatus() > 3) { //已发货订单不可取消
 			return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "订单不可取消");
 		}
-		if (StringUtils.isNotBlank(remark)) {
-			orderInfo.setCancelRemark(remark);
+		if (StringUtils.isNotBlank(param.getRemark())) {
+			orderInfo.setCancelRemark(param.getRemark());
 		}
 		updateSelectiveByIdRe(orderInfo);
 		return ObjectRestResponse.succ();
@@ -590,4 +589,39 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 	}
 
 
+	/**
+	 * 查询用户所有订单
+	 * @param userOrderDto
+	 * @return
+	 */
+	public ObjectRestResponse getOrderList(UserOrderDto userOrderDto) {
+		Query query = new Query(userOrderDto);
+		Example example = new Example(OrderInfo.class);
+		Example orderItemExample = new Example(OrderItem.class);
+		Example.Criteria orderInfoCriteria = example.createCriteria();
+		Example.Criteria orderItemCriteria = orderItemExample.createCriteria();
+		if (userOrderDto.getStatus() != null) {
+			orderInfoCriteria.andEqualTo("status", userOrderDto.getStatus());
+		}
+		if (userOrderDto.getPayStatus() != null) {
+			orderInfoCriteria.andEqualTo("payStatus", userOrderDto.getPayStatus());
+		}
+		if (userOrderDto.getUserId() != null) {
+			orderInfoCriteria.andEqualTo("userId", userOrderDto.getUserId());
+		}
+		if (StringUtils.isNotBlank(userOrderDto.getName())) {
+			orderItemCriteria.andLike("name", "%"+ userOrderDto.getName() +"%");
+		}
+		orderInfoCriteria.andNotEqualTo("status", -1);
+		example.orderBy("updTime").desc();
+		PageDataVO<OrderInfo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
+		if (pageDataVO != null && pageDataVO.getData() != null) {
+			fillOrderItem(pageDataVO.getData());
+			fillOrderEInvoice(pageDataVO.getData());
+			return ObjectRestResponse.succ(pageDataVO);
+		}
+		return ObjectRestResponse.succ(new PageDataVO<>());
+	}
+
+
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/OrderInfoController.java

 package com.upyuns.platform.rs.website.controller;
 
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.OrderInfoBiz;
+import com.upyuns.platform.rs.website.dto.UserOrderDto;
 import com.upyuns.platform.rs.website.entity.OrderInfo;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -10,4 +13,13 @@ import org.springframework.web.bind.annotation.RestController;
 @RequestMapping("orderInfo")
 public class OrderInfoController extends BaseController<OrderInfoBiz,OrderInfo> {
 
+	@GetMapping(value = "getOrderList")
+	public ObjectRestResponse getOrderList(UserOrderDto userOrderDto) {
+		return baseBiz.getOrderList(userOrderDto);
+	}
+
+	@GetMapping(value = "detail")
+	public ObjectRestResponse detail(Long orderId) {
+		return ObjectRestResponse.succ(baseBiz.getOrderDetail(orderId));
+	}
 }
\ No newline at end of file

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/controller/web/OrderInfoWebController.java

@@ -3,9 +3,7 @@ package com.upyuns.platform.rs.website.controller.web;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.upyuns.platform.rs.website.biz.OrderInfoBiz;
-import com.upyuns.platform.rs.website.dto.ConfirmOrderDto;
-import com.upyuns.platform.rs.website.dto.OrderInfoDto;
-import com.upyuns.platform.rs.website.dto.UserOrderDto;
+import com.upyuns.platform.rs.website.dto.*;
 import com.upyuns.platform.rs.website.entity.OrderInfo;
 import com.upyuns.platform.rs.website.service.ConfirmOrderService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -37,4 +35,39 @@ public class OrderInfoWebController extends BaseController<OrderInfoBiz,OrderInf
 	public ObjectRestResponse getDetail(Long id) {
 		return ObjectRestResponse.succ(baseBiz.getOrderDetail(id));
 	}
+
+	@GetMapping(value = "confirmReceived")
+	public ObjectRestResponse confirmReceived(Long orderId) {
+		return baseBiz.confirmReceived(orderId);
+	}
+
+	@PostMapping(value = "orderSend")
+	public ObjectRestResponse orderSend(@RequestBody ConfirmReceivedDto confirmReceivedDto) {
+		return baseBiz.orderSend(confirmReceivedDto);
+	}
+
+	@PostMapping(value = "setInvoice")
+	public ObjectRestResponse setInvoice(@RequestBody OrderInvoiceDto orderInvoiceDto) {
+		return baseBiz.setInvoice(orderInvoiceDto);
+	}
+
+	@PostMapping(value = "invoiceSend")
+	public ObjectRestResponse invoiceSend(@RequestBody ConfirmReceivedDto confirmReceivedDto) {
+		return baseBiz.invoiceSend(confirmReceivedDto);
+	}
+
+	@GetMapping(value = "confirmOrderInvoice")
+	public ObjectRestResponse confirmOrderInvoice(Long orderId) {
+		return baseBiz.confirmOrderInvoice(orderId);
+	}
+
+	@PostMapping(value = "cancelOrder")
+	public ObjectRestResponse cancelOrder(@RequestBody OrderInfo orderInfo) {
+		return baseBiz.cancelOrder(orderInfo);
+	}
+
+	@DeleteMapping(value = "deleteOrder")
+	public ObjectRestResponse deleteOrder(Long orderId) {
+		return baseBiz.deleteOrder(orderId);
+	}
 }
\ No newline at end of file