From c8638bb17163cc95e9063c358eb92cada1474102 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 12 六月 2023 09:00:05 +0800
Subject: [PATCH] 用户端代码
---
src/main/java/com/stylefeng/guns/modular/system/service/impl/TOrderServiceImpl.java | 33 +++++++++++++++++++--------------
1 files changed, 19 insertions(+), 14 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..73deee3 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
@@ -9,6 +9,7 @@
import com.stylefeng.guns.modular.system.dao.*;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
+import com.stylefeng.guns.modular.system.utils.GoogleMap.GeocodeVo;
import com.stylefeng.guns.modular.system.utils.GoogleMap.GoogleMapUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -102,7 +103,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 +142,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 +162,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;
}
@@ -480,15 +481,15 @@
lonLat.setLng(tOrder.getStartLon());
lonLats.add(lonLat);
String s = tOrder.geteAddress();
-// GeocodeVo geocode = googleMapUtil.getGeocode(s);
-// orderInfo.setElat(String.valueOf(geocode.getLat()));
-// orderInfo.setElon(String.valueOf(geocode.getLng()));
+ GeocodeVo geocode = googleMapUtil.getGeocode(s);
+ orderInfo.setElat(String.valueOf(geocode.getLat()));
+ orderInfo.setElon(String.valueOf(geocode.getLng()));
lonLat=new LonLat();
- lonLat.setLng("-113.066919618184");
- lonLat.setLat("37.684389618184");
+ lonLat.setLng(tOrder.getStartLon());
+ lonLat.setLat(tOrder.getStartLat());
lonLats.add(lonLat);
- orderInfo.setElat("37.684389618184");
- orderInfo.setElon("-113.066919618184");
+ orderInfo.setElat(String.valueOf(geocode.getLat()));
+ orderInfo.setElon(String.valueOf(geocode.getLng()));
orderInfo.setLonLats(lonLats);
Long quoteId = tQuoteMapper.selectList(new EntityWrapper<TQuote>().eq("order_id", tOrder.geteZipZ())).get(0).getId();
@@ -502,10 +503,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();
@@ -538,6 +542,7 @@
ArrayList<String> strings = new ArrayList<>();
goods.forEach(e->{
strings.add(e.getContainerNumber());
+ strings.add(String.valueOf(e.getOrderId()));
orderInfo.setBl(e.getBillNumber());
});
orderInfo.setContainer(strings);
--
Gitblit v1.7.1