From 6c1a535a157864b177c17aa14afcda9ad92a2a9b Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 25 Aug 2021 15:08:23 +0800
Subject: [PATCH] 20210825
---
gc-shop/src/main/java/com/xzx/gc/shop/service/JhyService.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
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 c6060c4..3cd814c 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
@@ -53,6 +53,17 @@
String name = model.getAccount();
model.setAccount(name);
model.setAccountPhone(accountPhone);
+ List<Integer> status = new ArrayList<>();
+ if(CollUtil.isEmpty(model.getStatus())){
+ status.add(1);
+ status.add(2);
+ status.add(3);
+ status.add(4);
+ status.add(5);
+ status.add(6);
+ model.setStatus(status);
+ }
+
List<QueryJhyOrderListVo> maps = jhyOrderMapper.queryOrderList(model);
if(CollUtil.isNotEmpty(maps)){
for(QueryJhyOrderListVo queryJhyOrderListVo : maps){
@@ -163,11 +174,10 @@
return total;
}
- public void assignJhyOrder(AssignJhyOrderDto model) {
+ public void assignJhyOrder(AssignJhyOrderDto model,String userId) {
Long orderId = model.getOrderId();
- Long jhyId = model.getJhyId();
JhyOrder order = jhyOrderMapper.selectByPrimaryKey(orderId);
- order.setJhyId(jhyId.toString());
+ order.setJhyId(userId);
order.setStatus(JhyOrder.ORDER_STATUS_IMG);
jhyOrderMapper.updateByPrimaryKey(order);
}
--
Gitblit v1.9.1