From 88ee0212f8e3e6f1a61ba25c13e0c19b45c68a6c Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期一, 19 四月 2021 11:27:02 +0800
Subject: [PATCH] add 按店铺名称搜索
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java | 2 +-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java | 8 +++++++-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java | 2 ++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java | 8 ++++----
4 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java
index f8d11a1..bf80f53 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/dtos/shop/PageComShopOrderSearchDTO.java
@@ -27,6 +27,8 @@
private String receiverPhone;
@ApiModelProperty(value = "商品",example = "鞋")
private String goodsName;
+ @ApiModelProperty(value = "店铺名称",example = "小二的店")
+ private String storeName;
@ApiModelProperty(value = "订单状态(1.待付款 2.代发货 3.待收货 4.待评价 5.已完成 6.已取消)",example = "1")
private Integer status;
@ApiModelProperty(value = "下单时间-开始",example = "1")
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
index 6db7b6d..ec78284 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/service/community/CommunityService.java
@@ -1854,7 +1854,7 @@
R pageShopOperLog(@RequestBody PageDTO pageDTO);
/**
- * 分页查询 商家后台操作日志
+ * 分页查询 商家后台订单
* @param pageComShopOrderSearchDTO 分页数据
* @return 分页日志
*/
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
index 72867c2..9706210 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java
@@ -396,9 +396,9 @@
}
/**
- * 订单发货
+ * 订单配送
* @param deliverDTO 订单ID
- * @return 发货结果
+ * @return 配送结果
*/
@PostMapping("/deliverOrder")
R deliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
@@ -406,9 +406,9 @@
return comShopOrderService.deliverOrder(orderId);
}
/**
- * 订单发货
+ * 订单配送
* @param deliverDTO 订单ID
- * @return 发货结果
+ * @return 配送完成
*/
@PostMapping("/finishDeliverOrder")
R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java
index 3d1f05e..f51d358 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopOrderDAO.java
@@ -44,6 +44,9 @@
" LEFT JOIN com_shop_user_address uad ON sr.receiver_id = uad.id \n" +
" LEFT JOIN com_shop_store ss ON sr.store_id = ss.id \n" +
" WHERE sr.delete_status = 1" +
+ "<if test='pageComShopOrderSearchDTO.userId != null'>" +
+ " AND sr.user_id = #{pageComShopOrderSearchDTO.userId} " +
+ " </if> " +
"<if test='pageComShopOrderSearchDTO.createAtStart != null'>" +
" AND #{pageComShopOrderSearchDTO.createAtStart} <![CDATA[<=]]> sr.create_at " +
" </if> " +
@@ -67,6 +70,9 @@
" </if> " +
"<if test='pageComShopOrderSearchDTO.status != null '>" +
" AND sr.status = #{pageComShopOrderSearchDTO.status} " +
+ " </if> " +
+ "<if test='pageComShopOrderSearchDTO.storeName != null '>" +
+ " AND ss.name like concat('%', #{pageComShopOrderSearchDTO.storeName}, '%') " +
" </if> " +
" ORDER BY sr.create_at "+
"</script>")
@@ -94,7 +100,7 @@
" LEFT JOIN com_shop_store ss ON sr.store_id = ss.id \n" +
" WHERE sr.delete_status = 1" +
"<if test='comShopOrderExportDTO.userId != null'>" +
- " AND com_shop_store.user_id = #{comShopOrderExportDTO.userId} " +
+ " AND ss.user_id = #{comShopOrderExportDTO.userId} " +
" </if> " +
"<if test='comShopOrderExportDTO.orderIds != null and comShopOrderExportDTO.orderIds.length>0 '>" +
" AND sr.id in " +
--
Gitblit v1.7.1