From 3035c389fc2d7f043702e72e7b99de4c8888d02a Mon Sep 17 00:00:00 2001
From: liuqingkun <LIUqk6666_>
Date: Tue, 22 Aug 2023 17:12:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E8=AE=A2=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/controller/OrderController.java        | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/springblade/modules/desk/controller/OrderController.java b/src/main/java/org/springblade/modules/desk/controller/OrderController.java
index cb2aa6f..739be5a 100644
--- a/src/main/java/org/springblade/modules/desk/controller/OrderController.java
+++ b/src/main/java/org/springblade/modules/desk/controller/OrderController.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.sun.org.apache.xalan.internal.xsltc.compiler.util.ErrorMsg;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.cache.AddressCache;
 import org.springblade.common.cache.DictBizCache;
 import org.springblade.common.constant.DictConstant;
 import org.springblade.common.enums.*;
@@ -19,6 +20,7 @@ import org.springblade.core.tool.utils.*;
 import org.springblade.modules.desk.entity.Order;
 import org.springblade.modules.desk.service.IOrderService;
 import org.springblade.modules.desk.vo.OrderExcelVO;
+import org.springblade.modules.weixin.entity.WeChatAddress;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -52,7 +54,7 @@ public class OrderController {
 	 * 分页
 	 */
 	@GetMapping("/page")
-	public R<IPage<Order>> page(Query query, String buyerName, String buyerPhone, String orderNo) {
+	public R<IPage<Order>> page(Query query, String buyerName, String buyerPhone, String orderNo, String status) {
 		LambdaQueryWrapper<Order> wrapper = Wrappers.lambdaQuery();
 		if (Func.isNotEmpty(buyerName)) {
 			wrapper.like(Order::getBuyerName, buyerName);
@@ -63,6 +65,9 @@ public class OrderController {
 		if (Func.isNotEmpty(orderNo)) {
 			wrapper.like(Order::getOrderNo, orderNo);
 		}
+		if (Func.isNotEmpty(orderNo)) {
+			wrapper.eq(Order::getStatus, status);
+		}
 
 		IPage<Order> pages = orderService.page(Condition.getPage(query), wrapper);
 		return R.data(pages);
@@ -114,9 +119,17 @@ public class OrderController {
 		String goodsName = DictBizCache.getValue(DictConstant.GOODS_INFO, DictConstant.GOODS_INFO_KEY_NAME);
 		info.setGoodsName(goodsName);
 		info.setGoodsNum(1);
-		String price = DictBizCache.getValue(DictConstant.GOODS_INFO, DictConstant.GOODS_INFO_KEY_NAME);
+		String price = DictBizCache.getValue(DictConstant.GOODS_INFO, DictConstant.GOODS_INFO_KEY_PRICE);
 		info.setGoodsPrice(Func.toDouble(price));
 
+		// 设置默认地址
+		WeChatAddress address = AddressCache.getAddress(info.getBuyerPhone());
+		if (Func.isNotEmpty(address)) {
+			info.setAddress(address.getArea().concat(address.getAddress()));
+			info.setConsignee(address.getConsignee());
+			info.setConsigneePhone(address.getPhone());
+		}
+
 		if (orderService.save(info)) {
 			return R.data(info);
 		} else {