From dffcec437fd95727867192bef825617f65d027ce Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期一, 19 二月 2024 11:20:02 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/IgoTravel into dev
---
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 84 +++++++++++++++++++++++++++++++++--------
1 files changed, 67 insertions(+), 17 deletions(-)
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 51a7334..9c3b445 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -181,12 +181,12 @@
String[] split = endLonLat.split(",");
Double lng = Double.valueOf(split[0]);
Double lat = Double.valueOf(split[1]);
- ResultUtil<Map<String, Double>> price = this.getPrice1(type, startLonLat.split(",")[0], startLonLat.split(",")[1], lng.toString(), lat.toString(), language);
+ ResultUtil<Map<String, Object>> price = this.getPrice1(type, startLonLat.split(",")[0], startLonLat.split(",")[1], lng.toString(), lat.toString(), language);
if(price.getCode() != 200){
return price;
}
Integer i = this.selectCount(new EntityWrapper<OrderLogistics>().eq("userId", uid).eq("isDelete", 1));
- Map<String, Double> map = price.getData();
+ Map<String, Object> map = price.getData();
map.put("first", i.doubleValue());
return price;
}
@@ -204,11 +204,21 @@
String[] split = endLonLat.split(",");
Double lng = Double.valueOf(split[0]);
Double lat = Double.valueOf(split[1]);
- ResultUtil<Map<String, Double>> price = this.getPrice1(type, startLonLat.split(",")[0], startLonLat.split(",")[1], lng.toString(), lat.toString(), language);
+ ResultUtil<Map<String, Object>> price = this.getPrice1(type, startLonLat.split(",")[0], startLonLat.split(",")[1], lng.toString(), lat.toString(), language);
if(price.getCode() == 200 && type == 5){
- Map<String, Double> data = price.getData();
- data.put("ordinary", data.get("ordinary") * number);
- data.put("precious", data.get("precious") * number);
+ Map<String, Object> data = price.getData();
+ Double ordinary = Double.valueOf(data.get("ordinary").toString());
+ Double precious = Double.valueOf(data.get("precious").toString());
+ data.put("ordinary", ordinary * number);
+ data.put("precious", precious * number);
+ }
+ if(price.getCode() == 200){
+ Map<String, Object> data = price.getData();
+ Double ordinary = Double.valueOf(data.get("ordinary").toString());
+ Double precious = Double.valueOf(data.get("precious").toString());
+ Double discountMoney = Double.valueOf(data.get("discountMoney").toString());
+ data.put("ordinary", ordinary - discountMoney);
+ data.put("precious", precious - discountMoney);
}
return price;
}
@@ -280,17 +290,31 @@
orderLogistics.setMileage(0D);
orderLogistics.setIsReassign(1);
orderLogistics.setReassignNotice(0);
- ResultUtil<Map<String, Double>> price = this.getPrice1(type, String.valueOf(startLon), String.valueOf(startLat), lng.toString(), lat.toString(), language);
+ ResultUtil<Map<String, Object>> price = this.getPrice1(type, String.valueOf(startLon), String.valueOf(startLat), lng.toString(), lat.toString(), language);
if(price.getCode() != 200){
return price;
}
- Map<String, Double> data = price.getData();
- orderLogistics.setOrderMoney((cargoType == 1 ? data.get("ordinary") : data.get("precious")) + tipMoney);
- orderLogistics.setTravelMoney(cargoType == 1 ? data.get("ordinary") : data.get("precious"));
- if(type == 5){
- orderLogistics.setOrderMoney(((cargoType == 1 ? data.get("ordinary") : data.get("precious")) * cargoNumber) + tipMoney);
- orderLogistics.setTravelMoney((cargoType == 1 ? data.get("ordinary") : data.get("precious")) * cargoNumber);
+ Map<String, Object> data = price.getData();
+ Double ordinary = Double.valueOf(data.get("ordinary").toString());
+ Double precious = Double.valueOf(data.get("precious").toString());
+ Double discount = null;
+ if(null != data.get("discount")){
+ discount = Double.valueOf(data.get("discount").toString());
}
+ Double discountMoney = Double.valueOf(data.get("discountMoney").toString());
+ Integer activityId = null;
+ if(null != data.get("activityId")){
+ activityId = Integer.valueOf(data.get("activityId").toString());
+ }
+ orderLogistics.setOrderMoney((cargoType == 1 ? ordinary : precious) + tipMoney);
+ orderLogistics.setTravelMoney((cargoType == 1 ? ordinary : precious));
+ if(type == 5){
+ orderLogistics.setOrderMoney(((cargoType == 1 ? ordinary : precious) * cargoNumber) + tipMoney);
+ orderLogistics.setTravelMoney((cargoType == 1 ? ordinary : precious) * cargoNumber);
+ }
+ orderLogistics.setDiscount(discount);
+ orderLogistics.setDiscountMoney(discountMoney);
+ orderLogistics.setActivityId(activityId);
orderLogistics.setTipMoney(tipMoney);
orderLogistics.setState(7);//待支付
orderLogistics.setInsertTime(new Date());
@@ -360,7 +384,7 @@
- public ResultUtil<Map<String, Double>> getPrice1(Integer type, String startLon, String startLat, String endLon, String endLat, Integer language) throws Exception{
+ public ResultUtil<Map<String, Object>> getPrice1(Integer type, String startLon, String startLat, String endLon, String endLat, Integer language) throws Exception{
Company query = companyCityService.query1(startLon, startLat);
if(null == query){
return ResultUtil.error(language == 1 ? "预约取货点暂无企业服务" : language == 2 ?
@@ -368,6 +392,9 @@
}
Double price1 = 0D;
Double price2 = 0D;
+ Double discount = null;
+ Double discountMoney = 0D;
+ Integer activityId = null;
if(type == 4){//同城
Map<String, Object> query1 = systemPriceMapper.query(query.getId(), type, null);
DistancematrixVo distancematrix = GoogleMapUtil.getDistancematrix(Double.valueOf(startLat), Double.valueOf(startLon), Double.valueOf(endLat), Double.valueOf(endLon));
@@ -403,9 +430,23 @@
price1 = jsonObject.getDouble("num1");
price2 = jsonObject.getDouble("num2");
}
- Map<String, Double> map = new HashMap<>();
+
+ //计算折扣
+ UserActivityDiscount1 query2 = userActivityDiscount1Mapper.query(query.getId());
+ if(null != query2){
+ activityId = query2.getId();
+ discount = query2.getLogistics();
+ if(null != discount){
+ discountMoney = new BigDecimal(price1).multiply(new BigDecimal(discount / 10)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
+ }
+ }
+
+ Map<String, Object> map = new HashMap<>();
map.put("ordinary", price1);//普通
map.put("precious", price2);//贵重
+ map.put("discount", discount);//折扣
+ map.put("discountMoney", discountMoney);//折扣金额
+ map.put("activityId", activityId);//折扣活动id
return ResultUtil.success(map);
}
@@ -517,6 +558,10 @@
orderMoney = orderMoney - userCouponRecord.getMoney();
orderLogistics.setCouponMoney(userCouponRecord.getMoney());
orderLogistics.setCouponId(couponId);
+ }
+ //折扣
+ if(null != orderLogistics.getActivityId()){
+ orderMoney = orderMoney - orderLogistics.getDiscount();
}
orderMoney=new BigDecimal(orderMoney).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue();
@@ -1000,6 +1045,11 @@
}else{
map.put("receipt", "");
}
+ if(state == 7){
+ Double discountMoney = Double.valueOf(map.get("discountMoney").toString());
+ Double orderMoney = Double.valueOf(map.get("orderMoney").toString());
+ map.put("orderMoney", orderMoney - discountMoney);
+ }
}
return maps;
}
@@ -1311,8 +1361,8 @@
@Override
public List<Map<String, Object>> queryCoupon(Integer language, Integer orderId, Integer uid, Integer pageNum, Integer size) throws Exception {
OrderLogistics orderLogistics = this.selectById(orderId);
- List<Map<String, Object>> list = userCouponRecordService.queryCoupon(language, uid, orderLogistics.getCompanyId(), 1, 4, orderLogistics.getOrderMoney(), pageNum, size);
- List<Map<String, Object>> list1 = userCouponRecordService.queryCoupon(language, uid, orderLogistics.getCompanyId(), 1, 0, orderLogistics.getOrderMoney(), pageNum, size);
+ List<Map<String, Object>> list = userCouponRecordService.queryCoupon(language, uid, orderLogistics.getCompanyId(), 1, 4, orderLogistics.getOrderMoney() - orderLogistics.getDiscountMoney(), pageNum, size);
+ List<Map<String, Object>> list1 = userCouponRecordService.queryCoupon(language, uid, orderLogistics.getCompanyId(), 1, 0, orderLogistics.getOrderMoney() - orderLogistics.getDiscountMoney(), pageNum, size);
list.addAll(list1);
return list;
}
--
Gitblit v1.7.1