From abf323cc9a96877ead8aa5e5caacff8c75e4d2e7 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 02 Jul 2021 11:23:42 +0800
Subject: [PATCH] 20210702 积分拨付
---
gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java | 8 ++++----
gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml | 2 +-
gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java | 2 ++
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 12 ++++++------
gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml | 1 +
5 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java
index e0cc117..1c6c463 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/controller/AdminOrderController.java
@@ -117,10 +117,10 @@
if(ObjectUtil.isEmpty(scoreOrder)){
return JsonResult.failMessage("订单不存在！");
}
- Integer status = scoreOrder.getStatus();
- if(ScoreOrder.STATUS_DOING != status){
- return JsonResult.failMessage("当前订单不是已收货状态！");
- }
+// Integer status = scoreOrder.getStatus();
+// if(ScoreOrder.STATUS_DOING != status){
+// return JsonResult.failMessage("当前订单不是已收货状态！");
+// }
List<String> voucherImgs = model.getVoucherImgs();
if(CollUtil.isEmpty(voucherImgs)){
return JsonResult.failMessage("凭证不能为空！");
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
index 7acfb5e..53acdbc 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java
@@ -42,12 +42,12 @@
model.setAccount(name);
model.setAccountPhone(accountPhone);
List<QueryJhyOrderListVo> maps = jhyOrderMapper.queryOrderList(model);
- if(CollUtil.isNotEmpty(maps)){
- for(QueryJhyOrderListVo queryJhyOrderListVo : maps){
- String decode = StringUtils.decode(queryJhyOrderListVo.getName());
- queryJhyOrderListVo.setName(decode);
- }
- }
+// if(CollUtil.isNotEmpty(maps)){
+// for(QueryJhyOrderListVo queryJhyOrderListVo : maps){
+// String decode = StringUtils.decode(queryJhyOrderListVo.getName());
+// queryJhyOrderListVo.setName(decode);
+// }
+// }
PageInfo pageInfo = new PageInfo(maps);
int count = Convert.toInt(pageInfo.getTotal());
Map<String, Object> map = new HashMap<>();
diff --git a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java
index 1a46f07..bd49c0b 100644
--- a/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java
+++ b/gc-shop/src/main/java/com/xzx/gc/shop/vo/QueryOrderListVo.java
@@ -26,6 +26,8 @@
private String totalPrice;
@ApiModelProperty(value="数量")
private String cnt;
+ @ApiModelProperty(value="后台确认提货 1：是 2：否")
+ private Integer isFinish;
@ApiModelProperty(value="状态 2-待收货3-已完成4-已取消")
private String status;
@ApiModelProperty(value="物流公司")
diff --git a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
index f6aaa45..91ee9e4 100644
--- a/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/JhyOrderMapper.xml
@@ -12,7 +12,7 @@
a.reserve_time reserveTime,
a.status status,
a.remark remark,
- b.nick_name name,
+ a.username name,
b.mobile_phone mobilePhone,
(select ifnull(sum(score),0) from xzx_jhy_order_items where order_id = a.id) totalPrice,
(select ifnull(sum(weight),0) from xzx_jhy_order_items where order_id = a.id) totalWeight,
diff --git a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
index 2771b0f..e6cdcd0 100644
--- a/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
+++ b/gc-shop/src/main/resources/mapper/shop/ScoreOrderMapper.xml
@@ -6,6 +6,7 @@
SELECT
a.*,
a.CREATED_TIME createTime,
+ ifnull(a.is_finish,2) isFinish,
b.nick_name name,
b.mobile_phone phone,
d.express_com expressCom,
--
Gitblit v1.9.1