From d4f8078c2a062864dab885d6bd54fbe1195f85e2 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 12 六月 2023 11:07:18 +0800
Subject: [PATCH] 修改计费bug
---
driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/OrderServiceImpl.java | 340 +++++++++++++++++++++++++++++++++++---------------------
1 files changed, 213 insertions(+), 127 deletions(-)
diff --git a/driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/OrderServiceImpl.java b/driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/OrderServiceImpl.java
index 35829aa..12a1394 100644
--- a/driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/OrderServiceImpl.java
+++ b/driver/guns-admin/src/main/java/com/agentdriving/driver/modular/system/service/impl/OrderServiceImpl.java
@@ -195,10 +195,10 @@
.where("'" + geocode.getCity() + "' like CONCAT('%', city, '%') and '" + geocode.getDistrict() + "' like CONCAT('%', district, '%') "));
city = null != weatherCity ? weatherCity.getId().toString() : "";
}
+ order.setCreateTime(new Date());
order = getOrderPrice(1, d, 0, order, city);
order.setState(null == order.getDriverId() ? 101 : 102);
order.setStatus(1);
- order.setCreateTime(new Date());
this.insert(order);
driverService.updateById(driver);
//推送状态
@@ -242,7 +242,7 @@
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
JSONArray chargeStandard = jsonObject.getJSONArray("ChargeStandard");
JSONObject extraCost = jsonObject.getJSONObject("ExtraCost");
- Date date = new Date();
+ Date date = order.getCreateTime();
boolean b = true;
for (int i = 1; i < chargeStandard.size(); i++) {//各种时间段
@@ -257,18 +257,28 @@
Double num8 = jsonObject1.getDouble("num8");//超过num8每num10公里收取num11
String[] split = num1.split(":");
+ Integer hour1 = Integer.valueOf(split[0]);
Calendar s = Calendar.getInstance();
s.setTime(date);
- s.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split[0]));
+ s.set(Calendar.HOUR_OF_DAY, hour1);
s.set(Calendar.MINUTE, Integer.valueOf(split[1]));
s.set(Calendar.SECOND, 0);
split = num2.split(":");
+ Integer hour2 = Integer.valueOf(split[0]);
Calendar e = Calendar.getInstance();
e.setTime(date);
- e.set(Calendar.HOUR_OF_DAY, Integer.valueOf(split[0]));
+ e.set(Calendar.HOUR_OF_DAY, hour2);
e.set(Calendar.MINUTE, Integer.valueOf(split[1]));
e.set(Calendar.SECOND, 0);
+
+ if(hour1 > hour2){
+ if(s.getTimeInMillis() > date.getTime()){
+ s.set(Calendar.DAY_OF_YEAR, s.get(Calendar.DAY_OF_YEAR) - 1);
+ }else{
+ e.set(Calendar.DAY_OF_YEAR, e.get(Calendar.DAY_OF_YEAR) + 1);
+ }
+ }
if(date.getTime() >= s.getTimeInMillis() && date.getTime() < e.getTimeInMillis()){
b = false;
@@ -296,8 +306,8 @@
}
//计算长途里程超出的部分
if(distance.compareTo(num5) > 0){
- BigDecimal subtract1 = new BigDecimal(distance).subtract(new BigDecimal(num5));
- BigDecimal divide1 = subtract1.divide(new BigDecimal(num7), new MathContext(2, RoundingMode.HALF_EVEN));
+ BigDecimal subtract1 = new BigDecimal(distance).subtract(new BigDecimal(num5)).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ BigDecimal divide1 = subtract1.divide(new BigDecimal(num7), 2, BigDecimal.ROUND_HALF_EVEN);
BigDecimal multiply1 = divide1.multiply(new BigDecimal(num8));
order.setOverLongDistance(subtract1.doubleValue());//超出长途里程
order.setOverLongDistancePrice(multiply1.doubleValue());//超出长途里程费
@@ -340,8 +350,8 @@
}
//计算长途里程超出的部分
if(distance.compareTo(num5) > 0){
- BigDecimal subtract1 = new BigDecimal(distance).subtract(new BigDecimal(num5));
- BigDecimal divide1 = subtract1.divide(new BigDecimal(num7), new MathContext(2, RoundingMode.HALF_EVEN));
+ BigDecimal subtract1 = new BigDecimal(distance).subtract(new BigDecimal(num5)).setScale(2, BigDecimal.ROUND_HALF_EVEN);
+ BigDecimal divide1 = subtract1.divide(new BigDecimal(num7), 2, BigDecimal.ROUND_HALF_EVEN);
BigDecimal multiply1 = divide1.multiply(new BigDecimal(num8));
order.setOverLongDistance(subtract1.doubleValue());//超出长途里程
order.setOverLongDistancePrice(multiply1.doubleValue());//超出长途里程费
@@ -369,6 +379,8 @@
BigDecimal multiply = new BigDecimal(w).multiply(new BigDecimal(num4));
order.setOutWaitTime(w);//等待时长超出分钟
order.setOutWaitTimePrice(multiply.doubleValue());//等待时长超出费用
+ }else{
+
}
//恶劣天气
@@ -431,7 +443,7 @@
order.setLongDistancePrice(0D);//长途里程费
order.setOverLongDistance(0D);//超出长途里程
order.setOverLongDistancePrice(0d);//超出长途里程费
- order.setWaitTime(0);//等待时长
+// order.setWaitTime(0);//等待时长
order.setWaitTimePrice(0D);//等待费
order.setOutWaitTime(0);//超出等待时长
order.setOutWaitTimePrice(0D);//超出等待时长费
@@ -492,6 +504,10 @@
if(ToolUtil.isEmpty(value)){
continue;
}
+ DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", youTuiDriver.getDriverId()).eq("status", 1));
+ if(null == driverWork){
+ continue;
+ }
Map<String, Double> distance = GeodesyUtil.getDistance(value, order.getStartLng() + "," + order.getStartLat());
Double wgs84 = distance.get("WGS84");
if(d == null || d.compareTo(wgs84) > 0){
@@ -533,6 +549,10 @@
Double score = null;
Double d = null;
for (Driver driver1 : drivers) {
+ DriverWork driverWork = driverWorkService.selectOne(new EntityWrapper<DriverWork>().eq("driverId", driver1.getId()).eq("status", 1));
+ if(null == driverWork){
+ continue;
+ }
if(integral == null || integral.compareTo(driver1.getIntegral()) < 0){//积分大
integral = driver1.getIntegral();
score = driver1.getScore();
@@ -574,15 +594,52 @@
if(order1.getState() == 101 || order1.getState() == 201){
order1.setHallOrder(1);
OrderServiceImpl.this.updateById(order1);
+
+ ExtraPushOrder(order1);
}
}
}, num4 * 1000);
}else{
order.setHallOrder(1);
this.updateById(order);
+ ExtraPushOrder(order);
}
}
+
+ public void ExtraPushOrder(Order order){
+ String startLat = order.getStartLat();
+ String startLng = order.getStartLng();
+
+ //找到中心点
+ GeoJsonPoint geoJsonPoint = new GeoJsonPoint(Double.valueOf(startLng), Double.valueOf(startLat));
+ Double num = 5D;//范围公里
+ //构造半径
+ Distance distanceR = new Distance(num, Metrics.KILOMETERS);
+ //画圆
+ Circle circle = new Circle(geoJsonPoint, distanceR);
+ // 构造query对象
+ Query query = Query.query(Criteria.where("location").withinSphere(circle));
+ List<Location> locations = mongoTemplate.find(query, Location.class);
+ List<Integer> driverIds = locations.stream().map(Location::getDriverId).collect(Collectors.toList());
+ if(driverIds.size() == 0){
+ return;
+ }
+ List<DriverWork> tDriverWorks = driverWorkService.selectList(new EntityWrapper<DriverWork>().in("driverId", driverIds).eq("status", 1));
+ driverIds = tDriverWorks.stream().map(DriverWork::getDriverId).collect(Collectors.toList());
+ List<Driver> drivers = driverService.selectList(new EntityWrapper<Driver>().eq("approvalStatus", 2)
+ .eq("serverStatus", 1).eq("openOrderQRCode", 0).eq("status", 1).in("id", driverIds));
+ if(drivers.size() == 0){
+ return;
+ }
+ for (Driver driver1 : drivers) {
+ String value = redisUtil.getValue("DRIVER" + driver1.getId());
+ if (ToolUtil.isEmpty(value)) {
+ return;
+ }
+ pushUtil.pushGrabOrderExtras(driver1.getId(), 2);
+ }
+ }
/**
@@ -600,7 +657,7 @@
List<HallOrderList> hallOrderLists = this.baseMapper.queryOrderHall(pageNum, pageSize);
hallOrderLists.forEach(hallOrderList -> {
if(ToolUtil.isEmpty(hallOrderList.getAvatar())){
- hallOrderList.setAvatar("https://csxdj.obs.cn-south-1.myhuaweicloud.com:443/66cc269703a84e4da87fb21e2c21ab1f.png");
+ hallOrderList.setAvatar("https://fanghuadaijia.obs.cn-southwest-2.myhuaweicloud.com:443/img%2Fc68f32a7e78e4ef1b0c018fd2c15d7a7.png");
}
hallOrderList.setCurrentDistance(0D);
if(ToolUtil.isNotEmpty(value)){
@@ -750,8 +807,10 @@
orderTransferService.insert(orderTransfer);
}
- pushUtil.pushTransferSuccessful(order.getUserId(), 1, order.getId());
pushUtil.pushTransferSuccessful(oldDriverId, 2, order.getId());
+ if(null != order.getUserId()){
+ pushUtil.pushTransferSuccessful(order.getUserId(), 1, order.getId());
+ }
}
//推动订单数据
@@ -865,7 +924,7 @@
Driver driver = driverService.selectById(order.getDriverId());
driver.setServerStatus(1);
driverService.updateById(driver);
- accountChangeDetailService.deductionInsurance();//扣减保险费
+ accountChangeDetailService.deductionInsurance(order.getDriverId());//扣减保险费
saveIntegral(order);
break;
case 401:
@@ -901,6 +960,8 @@
accountChangeDetail.setUserType(2);
accountChangeDetail.setUserId(order.getDriverId());
accountChangeDetail.setType(2);
+ accountChangeDetail.setChangeType(5);
+ accountChangeDetail.setOrderId(order.getId());
accountChangeDetail.setOldData(driver.getIntegral().doubleValue());
driver.setIntegral(driver.getIntegral() + num5);
accountChangeDetail.setNewData(driver.getIntegral().doubleValue());
@@ -908,52 +969,35 @@
accountChangeDetailService.saveData(accountChangeDetail);
}
//恶劣天气完成订单奖励
- Integer num8 = JSON.parseObject(systemConfig.getContent()).getInteger("num8");
- if(num8 > 0){
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(order.getDriverId());
- accountChangeDetail.setType(2);
- accountChangeDetail.setOldData(driver.getIntegral().doubleValue());
- driver.setIntegral(driver.getIntegral() + num8);
- accountChangeDetail.setNewData(driver.getIntegral().doubleValue());
- accountChangeDetail.setExplain("恶劣天气完成订单奖励");
- accountChangeDetailService.saveData(accountChangeDetail);
+ String city = "";
+ District geocode = MapUtil.geocode(order.getStartLng(), order.getStartLat());
+ if(null != geocode){
+ WeatherCity weatherCity = weatherCityService.selectOne(new EntityWrapper<WeatherCity>()
+ .where("'" + geocode.getCity() + "' like CONCAT('%', city, '%') and '" + geocode.getDistrict() + "' like CONCAT('%', district, '%') "));
+ city = null != weatherCity ? weatherCity.getId().toString() : "";
}
+ boolean badWeather = WeatherUtil.isBadWeather(city);
+ if(badWeather){
+ Integer num8 = JSON.parseObject(systemConfig.getContent()).getInteger("num8");
+ if(num8 > 0){
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(order.getDriverId());
+ accountChangeDetail.setType(2);
+ accountChangeDetail.setOldData(driver.getIntegral().doubleValue());
+ driver.setIntegral(driver.getIntegral() + num8);
+ accountChangeDetail.setNewData(driver.getIntegral().doubleValue());
+ accountChangeDetail.setExplain("恶劣天气完成订单奖励");
+ accountChangeDetailService.saveData(accountChangeDetail);
+ }
+ }
+
driverService.updateById(driver);
if(null == order.getUserId()){
return;
}
- //推荐用户首单完成奖励
- Integer num4 = JSON.parseObject(systemConfig.getContent()).getInteger("num4");
- if(num4 > 0){
- List<Integer> state = Arrays.asList(105);
- int count = this.selectCount(new EntityWrapper<Order>().eq("userId", order.getUserId()).eq("status", 1).in("state", state));
- if(count > 1){
- return;
- }
- AppUser appUser = appUserService.selectById(order.getUserId());
- if(null != appUser && null != appUser.getInviterType()){
- if(appUser.getInviterType() == 1){
- return;
- }
- Driver driver1 = driverService.selectById(appUser.getInviterId());
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(driver1.getId());
- accountChangeDetail.setType(2);
- accountChangeDetail.setOldData(driver1.getIntegral().doubleValue());
- driver1.setIntegral(driver1.getIntegral() + num4);
- accountChangeDetail.setNewData(driver1.getIntegral().doubleValue());
- accountChangeDetail.setExplain("推荐用户完成首单奖励");
- accountChangeDetailService.saveData(accountChangeDetail);
- driverService.updateById(driver1);
- }
- }
-
}
}
@@ -992,7 +1036,7 @@
}
pushOrderInfoWarpper.setWaitTime(order.getWaitTime() + w);
pushOrderInfoWarpper.setState(order.getState());
- pushOrderInfoWarpper.setActualMileage(Double.valueOf(order.getActualMileage() / 1000));
+ pushOrderInfoWarpper.setActualMileage(new BigDecimal(order.getActualMileage() / 1000).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
pushOrderInfoWarpper.setTravelTime(0);
if(null != order.getStartTime()){
int travelTime = Double.valueOf((System.currentTimeMillis() - order.getStartTime().getTime()) / 60000).intValue();
@@ -1150,7 +1194,9 @@
driverService.updateById(driver);
}
- pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getStatus());
+ if(null != order.getUserId()){
+ pushUtil.pushOrderStatus(order.getUserId(), 1, order.getId(), order.getStatus());
+ }
return ResultUtil.success();
}
@@ -1215,6 +1261,8 @@
order.setCouponId(coupon.getId());
order.setDiscountAmount(coupon.getCouponPreferentialAmount());
order.setPayMoney(order.getOrderMoney() - coupon.getCouponPreferentialAmount());
+ }else{
+ order.setPayMoney(order.getOrderMoney());
}
}
@@ -1226,9 +1274,6 @@
userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
userToCouponService.updateById(userToCoupon);
Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
- order.setPayMoney(order.getPayMoney() - coupon.getCouponPreferentialAmount());
- order.setCouponId(coupon.getId());
- order.setDiscountedPrice(coupon.getCouponPreferentialAmount());
Driver driver = driverService.selectById(order.getDriverId());
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
@@ -1250,7 +1295,7 @@
}
this.updateById(order);
- if(state == 108){//计算抽成
+ if(payType == 2 && state == 108){//计算抽成
saveRevenue(order);
}
@@ -1274,6 +1319,33 @@
//司机分佣和司机推荐用户首单奖励都在平台的抽佣中扣除，剩余的为平台抽佣。
Driver driver = driverService.selectById(order.getDriverId());
AppUser appUser = appUserService.selectById(order.getUserId());
+
+ //司机推荐首单收入
+ List<Integer> state = Arrays.asList(108, 109);
+ int count = this.selectCount(new EntityWrapper<Order>().eq("userId", order.getUserId()).eq("status", 1).in("state", state));
+ if(null != appUser.getInviterType() && appUser.getInviterType() == 2 && count == 1){
+ Driver driver1 = driverService.selectById(appUser.getInviterId());
+ //首单积分奖励
+ SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 4));
+ JSONObject jsonObject2 = JSON.parseObject(systemConfig1.getContent());
+ Integer num4 = jsonObject2.getInteger("num4");
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(driver1.getId());
+ accountChangeDetail.setType(2);
+ accountChangeDetail.setChangeType(5);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setOldData(driver1.getIntegral().doubleValue());
+ accountChangeDetail.setExplain("邀请用户首单积分奖励");
+ accountChangeDetail.setCreateTime(new Date());
+ driver1.setIntegral(driver1.getIntegral() + num4);
+ accountChangeDetail.setNewData(driver1.getIntegral().doubleValue());
+ accountChangeDetailService.insert(accountChangeDetail);
+ driverService.updateById(driver1);
+ }
+
+
Double payMoney = order.getPayMoney();
SystemConfig systemConfig = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 3));
Double n = 0D;
@@ -1287,41 +1359,6 @@
SystemConfig systemConfig1 = systemConfigService.selectOne(new EntityWrapper<SystemConfig>().eq("type", 2));
if(null != systemConfig1){
JSONObject jsonObject1 = JSON.parseObject(systemConfig1.getContent());
- //司机推荐首单收入
- List<Integer> state = Arrays.asList(108, 109);
- int count = this.selectCount(new EntityWrapper<Order>().eq("userId", appUser.getId()).eq("status", 1).in("state", state));
- if(null != appUser.getInviterType() && appUser.getInviterType() == 2 && count == 1){
- Double num1 = jsonObject1.getDouble("num1");
- num1 = (num3 >= num1 ? num1 : num3);
-
- if(num1 > 0){
- Driver driver1 = driverService.selectById(appUser.getInviterId());
- AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
- accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
- accountChangeDetail.setUserType(2);
- accountChangeDetail.setUserId(driver1.getId());
- accountChangeDetail.setType(1);
- accountChangeDetail.setChangeType(5);
- accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
- accountChangeDetail.setExplain("订单分佣收入");
- accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num1);
- accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
- driverService.updateById(driver1);
- accountChangeDetailService.saveData(accountChangeDetail);
-
- Revenue revenue = new Revenue();
- revenue.setType(2);
- revenue.setUserType(2);
- revenue.setUserId(driver1.getId());
- revenue.setOrderId(order.getId());
- revenue.setAmount(num1);
- revenue.setCreateTime(new Date());
- revenueService.insert(revenue);
- }
- num3 = (num3 >= num1 ? num3 - num1 : 0);
- }
-
//开始处理层级抽佣
if(null != driver.getInviterType() && driver.getInviterType() == 2){
Driver driver1 = driverService.selectById(driver.getInviterId());//一级司机
@@ -1329,17 +1366,17 @@
Driver driver2 = driverService.selectById(driver1.getInviterId());//二级司机
if(null != driver2 && null != driver2.getInviterType() && driver2.getInviterType() == 2){
Driver driver3 = driverService.selectById(driver2.getInviterId());//三级级司机
+ Double num4 = jsonObject1.getDouble("num4");
Double num5 = jsonObject1.getDouble("num5");
Double num6 = jsonObject1.getDouble("num6");
- Double num7 = jsonObject1.getDouble("num7");
- num5 = (num3 >= num5 ? num5 : num3);
- if(num5 > 0){
+ num4 = (num3 >= num4 ? num4 : num3);
+ if(num4 > 0){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
revenue.setUserId(driver1.getId());
revenue.setOrderId(order.getId());
- revenue.setAmount(num5);
+ revenue.setAmount(num4);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
@@ -1352,20 +1389,20 @@
accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num5);
+ driver1.setCommission(driver1.getCommission() + num4);
accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num5 ? num3 - num5 : 0);
+ num3 = (num3 >= num4 ? num3 - num4 : 0);
}
- num6 = (num3 >= num6 ? num6 : num3);
- if(num6 > 0){
+ num5 = (num3 >= num5 ? num5 : num3);
+ if(num5 > 0){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
revenue.setUserId(driver2.getId());
revenue.setOrderId(order.getId());
- revenue.setAmount(num6);
+ revenue.setAmount(num5);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
@@ -1378,20 +1415,20 @@
accountChangeDetail.setOldData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver2.setCommission(driver2.getCommission() + num6);
+ driver2.setCommission(driver2.getCommission() + num5);
accountChangeDetail.setNewData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
driverService.updateById(driver2);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num6 ? num3 - num6 : 0);
+ num3 = (num3 >= num5 ? num3 - num5 : 0);
}
- num7 = (num3 >= num7 ? num7 : num3);
- if(num7 > 0){
+ num6 = (num3 >= num6 ? num6 : num3);
+ if(num6 > 0){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
revenue.setUserId(driver3.getId());
revenue.setOrderId(order.getId());
- revenue.setAmount(num7);
+ revenue.setAmount(num6);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
@@ -1404,23 +1441,23 @@
accountChangeDetail.setOldData(driver3.getBalance() + driver3.getBackgroundBalance() + driver3.getCouponBalance() + driver3.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver3.setCommission(driver3.getCommission() + num7);
+ driver3.setCommission(driver3.getCommission() + num6);
accountChangeDetail.setNewData(driver3.getBalance() + driver3.getBackgroundBalance() + driver3.getCouponBalance() + driver3.getCommission());
driverService.updateById(driver3);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num7 ? num3 - num7 : 0);
+ num3 = (num3 >= num6 ? num3 - num6 : 0);
}
}else{
+ Double num2_ = jsonObject1.getDouble("num2");
Double num3_ = jsonObject1.getDouble("num3");
- Double num4 = jsonObject1.getDouble("num4");
- num3_ = (num3 >= num3_ ? num3_ : num3);
- if(num3_ > 0){
+ num2_ = (num3 >= num2_ ? num2_ : num3);
+ if(num2_ > 0){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
revenue.setUserId(driver1.getId());
revenue.setOrderId(order.getId());
- revenue.setAmount(num3_);
+ revenue.setAmount(num2_);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
@@ -1433,20 +1470,20 @@
accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num3_);
+ driver1.setCommission(driver1.getCommission() + num2_);
accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num3_ ? num3 - num3_ : 0);
+ num3 = (num3 >= num2_ ? num3 - num2_ : 0);
}
- num4 = (num3 >= num4 ? num4 : num3);
- if(num4 > 0){
+ num3_ = (num3 >= num3_ ? num3_ : num3);
+ if(num3_ > 0){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
revenue.setUserId(driver2.getId());
revenue.setOrderId(order.getId());
- revenue.setAmount(num4);
+ revenue.setAmount(num3_);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
@@ -1459,23 +1496,23 @@
accountChangeDetail.setOldData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver2.setCommission(driver2.getCommission() + num4);
+ driver2.setCommission(driver2.getCommission() + num3_);
accountChangeDetail.setNewData(driver2.getBalance() + driver2.getBackgroundBalance() + driver2.getCouponBalance() + driver2.getCommission());
driverService.updateById(driver2);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num4 ? num3 - num4 : 0);
+ num3 = (num3 >= num3_ ? num3 - num3_ : 0);
}
}
}else{
- Double num2_ = jsonObject1.getDouble("num2");
- num2_ = (num3 >= num2_ ? num2_ : num3);
- if(num2_ > 0){
+ Double num1_ = jsonObject1.getDouble("num1");
+ num1_ = (num3 >= num1_ ? num1_ : num3);
+ if(num1_ > 0){
Revenue revenue = new Revenue();
revenue.setType(2);
revenue.setUserType(2);
revenue.setUserId(driver1.getId());
revenue.setOrderId(order.getId());
- revenue.setAmount(num2_);
+ revenue.setAmount(num1_);
revenue.setCreateTime(new Date());
revenueService.insert(revenue);
@@ -1488,11 +1525,11 @@
accountChangeDetail.setOldData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
accountChangeDetail.setExplain("订单分佣收入");
accountChangeDetail.setCreateTime(new Date());
- driver1.setCommission(driver1.getCommission() + num2_);
+ driver1.setCommission(driver1.getCommission() + num1_);
accountChangeDetail.setNewData(driver1.getBalance() + driver1.getBackgroundBalance() + driver1.getCouponBalance() + driver1.getCommission());
driverService.updateById(driver1);
accountChangeDetailService.saveData(accountChangeDetail);
- num3 = (num3 >= num2_ ? num3 - num2_ : 0);
+ num3 = (num3 >= num1_ ? num3 - num1_ : 0);
}
}
}
@@ -1512,6 +1549,7 @@
}
//司机余额扣减抽佣金额
if(n > 0){
+ driver = driverService.selectById(order.getDriverId());
AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
accountChangeDetail.setUserType(2);
@@ -1625,6 +1663,10 @@
if(performanceRankingWarpper.getDriverId().compareTo(driverId) == 0){
break;
}
+ if(i == performanceRankingWarppers.size() - 1){
+ position = 0;
+ d = 0D;
+ }
}
MyAchievementWarpper myAchievementWarpper = new MyAchievementWarpper();
myAchievementWarpper.setType("订单");
@@ -1646,6 +1688,10 @@
}
if(performanceRankingWarpper.getDriverId().compareTo(driverId) == 0){
break;
+ }
+ if(i == performanceRankingWarppers.size() - 1){
+ position = 0;
+ d = 0D;
}
}
myAchievementWarpper = new MyAchievementWarpper();
@@ -1669,6 +1715,10 @@
if(performanceRankingWarpper.getDriverId().compareTo(driverId) == 0){
break;
}
+ if(i == performanceRankingWarppers.size() - 1){
+ position = 0;
+ d = 0D;
+ }
}
myAchievementWarpper = new MyAchievementWarpper();
myAchievementWarpper.setType("佣金");
@@ -1685,6 +1735,42 @@
*/
@Override
public void completeCollection() {
- this.baseMapper.completeCollection();
+ List<Order> orders = this.selectList(new EntityWrapper<Order>().eq("state", 107).eq("status", 1)
+ .eq("payType", 3).last(" and UNIX_TIMESTAMP(getoffTime) + 120 <= UNIX_TIMESTAMP(now())"));
+ for (Order order : orders) {
+ order.setState(108);
+ order.setPayTime(new Date());
+ if(null != order.getCouponId()){
+ UserToCoupon userToCoupon = userToCouponService.selectById(order.getCouponId());
+ if(userToCoupon.getValidCount() > 0){
+ userToCoupon.setValidCount(userToCoupon.getValidCount() - 1);
+ userToCouponService.updateById(userToCoupon);
+ Coupon coupon = couponService.selectById(userToCoupon.getCouponId());
+
+ Driver driver = driverService.selectById(order.getDriverId());
+ AccountChangeDetail accountChangeDetail = new AccountChangeDetail();
+ accountChangeDetail.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(3));
+ accountChangeDetail.setUserType(2);
+ accountChangeDetail.setUserId(order.getDriverId());
+ accountChangeDetail.setCreateTime(new Date());
+ accountChangeDetail.setOldData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+ accountChangeDetail.setType(1);
+ accountChangeDetail.setChangeType(7);
+ accountChangeDetail.setOrderId(order.getId());
+ accountChangeDetail.setExplain("优惠券收入");
+ driver.setCouponBalance(driver.getCouponBalance() + coupon.getCouponPreferentialAmount());
+ accountChangeDetail.setNewData(driver.getBalance() + driver.getBackgroundBalance() + driver.getCouponBalance() + driver.getCommission());
+ driverService.updateById(driver);
+ accountChangeDetailService.insert(accountChangeDetail);
+ }
+ }
+ this.updateById(order);
+
+ try {
+ saveRevenue(order);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
}
}
--
Gitblit v1.7.1