From f9de931c4457c2a6bfe395879e3b2f2bfd7d9692 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期五, 26 五月 2023 16:55:34 +0800
Subject: [PATCH] 用户端代码
---
src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java b/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
index bddcba0..143bd67 100644
--- a/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
+++ b/src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java
@@ -102,7 +102,7 @@
@Override
public List<ShouldPayVo> getPayList(Page<ShouldPayVo> receivableVoPage, String time, String name) {
- List<ShouldPayVo> list = this.baseMapper.getPayList(receivableVoPage,name);
+ List<ShouldPayVo> list = this.baseMapper.getPayList(receivableVoPage,name,1);
Calendar instance = Calendar.getInstance();
instance.setTime(new Date());
@@ -141,7 +141,7 @@
sTime = time.split(" - ")[0]+" 00:00:01";
eTime = time.split(" - ")[1]+" 23:59:59";
}
- List<ReceivablesList> receivablesLists = this.baseMapper.listOfReceivables(receivableVoPage, sTime, eTime, name, invoicesId, orderId, state);
+ List<ReceivablesList> receivablesLists = this.baseMapper.listOfReceivables(receivableVoPage, sTime, eTime, name, invoicesId, orderId, state,1);
for (ReceivablesList receivablesList : receivablesLists) {
Integer id= this.baseMapper.getPayStatus(receivablesList.getOrderId());
if(id==null){
@@ -161,7 +161,7 @@
sTime = time.split(" - ")[0]+" 00:00:01";
eTime = time.split(" - ")[1]+" 23:59:59";
}
- List<PayList> list = this.baseMapper.listOfPay(receivableVoPage, sTime, eTime, name, billId, orderId, state);
+ List<PayList> list = this.baseMapper.listOfPay(receivableVoPage, sTime, eTime, name, billId, orderId, state,1);
return list;
}
@@ -502,10 +502,13 @@
Integer groupId = tUser.getGroupId();
if(groupId!=null) {
TGroup tGroup = tGroupMapper.selectById(groupId);
- orderInfo.setSalesGroup(tGroup.getName());
- Integer salesId = tGroup.getSalesId();
- User user = userMapper.selectById(salesId);
- orderInfo.setSales(user.getName());
+ if(tGroup!=null){
+ orderInfo.setSalesGroup(tGroup.getName());
+ Integer salesId = tGroup.getSalesId();
+ User user = userMapper.selectById(salesId);
+ orderInfo.setSales(user.getName());
+ }
+
}
// 获取码头id 获取码头地址 pickup信息
Integer portId = tOrder.getPort();
--
Gitblit v1.7.1