From 297b4b60ca499969eeccc1a5113810fdc2034486 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 23 Jul 2021 10:47:20 +0800
Subject: [PATCH] Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
---
gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java b/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
index b46eba3..ccedcc9 100644
--- a/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
+++ b/gc-user/src/main/java/com/xzx/gc/user/service/DistribService.java
@@ -233,8 +233,7 @@
return data;
}
- public void adddistrib(AdddistribDto model) {
- String id = model.getId();
+ public void adddistrib(String id) {
AccountInfo accountInfo = accountMapper.selectByPrimaryKey(id);
accountInfo.setIsHead(1);
accountMapper.updateByPrimaryKey(accountInfo);
@@ -305,6 +304,9 @@
if(CollUtil.isNotEmpty(orderItemsVos)){
for(OrderItemsVo orderItemsVo : orderItemsVos){
if(ObjectUtil.isNotEmpty(orderItemsVo)){
+ String nickname = orderItemsVo.getNickname();
+ String decode = StringUtils.decode(nickname);
+ orderItemsVo.setNickname(decode);
Long orderId = orderItemsVo.getOrderId();
List<JhyOrderItems> jhyOrderItems = accountMapper.selectOrderById(orderId);
if(CollUtil.isNotEmpty(jhyOrderItems)){
@@ -346,9 +348,9 @@
String decode = StringUtils.decode(nickname);
distribDataListVo.setNickname(decode);
String id = distribDataListVo.getId();
- String kg = accountMapper.selectOrderByHeadUserId(id);
+ String kg = accountMapper.selectOrderByHeadUserId(id,distribDataListDto);
distribDataListVo.setKg(kg);
- String jdsl = accountMapper.selectJDSLByHeadUserId(id);
+ String jdsl = accountMapper.selectJDSLByHeadUserId(id,distribDataListDto);
distribDataListVo.setJdsl(jdsl);
}
}
@@ -380,9 +382,9 @@
String decode = StringUtils.decode(nickname);
distribDataListVo.setNickname(decode);
String id = distribDataListVo.getId();
- String kg = accountMapper.selectOrderByHeadUserId(id);
+ String kg = accountMapper.selectOrderExportByHeadUserId(id,distribDataListDto);
distribDataListVo.setKg(kg);
- String jdsl = accountMapper.selectJDSLByHeadUserId(id);
+ String jdsl = accountMapper.selectJDSLExportByHeadUserId(id,distribDataListDto);
distribDataListVo.setJdsl(jdsl);
}
}
--
Gitblit v1.9.1