Merge remote-tracking branch 'origin/dev' into dev

ace-common/src/main/java/com/github/wxiaoqi/security/common/util/process/ResultCode.java

@@ -45,6 +45,8 @@ public class ResultCode {
 
 	public static int ORDER_NOT_EXIST = Integer.valueOf(SystemProperty.getResultConfig("ORDER_NOT_EXIST"));
 
+	public static int ORDER_STATUS_ERROR = Integer.valueOf(SystemProperty.getResultConfig("ORDER_STATUS_ERROR"));
+
 	public static int ORDER_GOODS_EXIST = Integer.valueOf(SystemProperty.getResultConfig("ORDER_GOODS_EXIST"));
 
 

rs-website/rs-website-api/src/main/java/com/upyuns/platform/rs/website/dto/ConfirmReceivedDto.java

@@ -19,7 +19,7 @@ public class ConfirmReceivedDto {
 	String trackingNumber;
 
 	/**
-	 * 快递单图片
+	 * 快递公司
 	 */
 	String trackingImg;
 }

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

@@ -150,9 +150,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 	public ObjectRestResponse getUserOrder(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());
 		}
@@ -162,22 +160,19 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 		if (userOrderDto.getUserId() != null) {
 			orderInfoCriteria.andEqualTo("userId", userOrderDto.getUserId());
 		}
-		if (StringUtils.isNotBlank(userOrderDto.getName())) {
-			orderItemCriteria.andLike("name", "%" + userOrderDto.getName() + "%");
-		}
 		if (StringUtils.isNotBlank(userOrderDto.getStartTime()) && StringUtils.isNotBlank(userOrderDto.getEndTime())) {
-			orderItemCriteria.andBetween("crtTime", userOrderDto.getStartTime(), userOrderDto.getEndTime());
+			orderInfoCriteria.andBetween("crtTime", userOrderDto.getStartTime(), userOrderDto.getEndTime());
 		}
 		orderInfoCriteria.andNotEqualTo("status", -1);
 		example.orderBy("updTime").desc();
 		PageDataVO<OrderInfo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
 
-		if (pageDataVO != null && pageDataVO.getData() != null) {
+		if (pageDataVO != null && pageDataVO.getData() != null && pageDataVO.getData().size() > 0) {
 			fillOrderItem(pageDataVO.getData());
 			fillOrderEInvoice(pageDataVO.getData());
 			return ObjectRestResponse.succ(pageDataVO);
 		}
-		return ObjectRestResponse.succ(new PageDataVO<>());
+		return ObjectRestResponse.succ(pageDataVO);
 	}
 
 	/**
@@ -337,7 +332,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 					ShoppingCartInfo shoppingCartInfo = shoppingCartInfoBiz.selectById(itemInfoDto.getId());
 					if (shoppingCartInfo != null) {
 						OrderItem orderItem = new OrderItem();
-						orderItem.setType(itemInfoDto.getType());
+						orderItem.setType(shoppingCartInfo.getType());
 						orderItem.setTotalAmount(shoppingCartInfo.getPrice().multiply(new BigDecimal(itemInfoDto.getNumber())));
 						orderItem.setPrice(shoppingCartInfo.getPrice());
 						orderItem.setNumber(itemInfoDto.getNumber());
@@ -616,9 +611,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 	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());
 		}
@@ -637,21 +630,38 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 		if (StringUtils.isNotBlank(userOrderDto.getPhone())) {
 			orderInfoCriteria.andEqualTo("phone", userOrderDto.getPhone());
 		}
+		if (userOrderDto.getType() != null) {
+			orderInfoCriteria.andEqualTo("type", userOrderDto.getType());
+		}
+		if (userOrderDto.getSendType() != null) {
+			orderInfoCriteria.andEqualTo("sendType", userOrderDto.getSendType());
+		}
+		if (userOrderDto.getInvoiceStatus() != null && userOrderDto.getInvoiceStatus() >= 2) {
+			orderInfoCriteria.andGreaterThan("invoiceStatus", userOrderDto.getInvoiceStatus());
+		}
+		if (userOrderDto.getInvoiceStatus() != null && userOrderDto.getInvoiceStatus() == 1) {
+			orderInfoCriteria.andEqualTo("invoiceStatus", userOrderDto.getInvoiceStatus());
+		}
 		if (StringUtils.isNotBlank(userOrderDto.getStartTime()) && StringUtils.isNotBlank(userOrderDto.getEndTime())) {
-			orderItemCriteria.andBetween("crtTime", userOrderDto.getStartTime(), userOrderDto.getEndTime());
+			orderInfoCriteria.andBetween("crtTime", userOrderDto.getStartTime(), userOrderDto.getEndTime());
 		}
 		if (StringUtils.isNotBlank(userOrderDto.getName())) {
-			orderItemCriteria.andLike("name", "%" + userOrderDto.getName() + "%");
+			orderInfoCriteria.andLike("realName", "%" + userOrderDto.getName() + "%");
+		}
+		if (StringUtils.isNotBlank(userOrderDto.getKeywords())) {
+			orderInfoCriteria.andLike("realName", "%" + userOrderDto.getKeywords() + "%")
+					.orLike("realName", "%" + userOrderDto.getKeywords() + "%")
+					.orLike("phone", "%" +userOrderDto.getKeywords()+ "%")
+					.orLike("orderNo", "%" +userOrderDto.getKeywords()+ "%");
 		}
-		orderInfoCriteria.andNotEqualTo("status", -1);
 		example.orderBy("updTime").desc();
 		PageDataVO<OrderInfo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.selectByExample(example));
-		if (pageDataVO != null && pageDataVO.getData() != null) {
+		if (pageDataVO != null && pageDataVO.getData() != null && pageDataVO.getData().size() > 0) {
 			fillOrderItem(pageDataVO.getData());
 			fillOrderEInvoice(pageDataVO.getData());
 			return ObjectRestResponse.succ(pageDataVO);
 		}
-		return ObjectRestResponse.succ(new PageDataVO<>());
+		return ObjectRestResponse.succ(pageDataVO);
 	}