From c18ec3846c8483975de2224c1ecac9470e9b2804 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 16 八月 2023 19:21:36 +0800
Subject: [PATCH] 同步代码
---
user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java | 69 ++++++++++++++++++++++++++++++++--
1 files changed, 64 insertions(+), 5 deletions(-)
diff --git a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
index d3c9c7a..f896aeb 100644
--- a/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
+++ b/user/guns-admin/src/main/java/com/supersavedriving/user/modular/system/service/impl/OrderServiceImpl.java
@@ -1,6 +1,5 @@
package com.supersavedriving.user.modular.system.service.impl;
-import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -34,6 +33,7 @@
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.math.BigDecimal;
import java.math.MathContext;
import java.math.RoundingMode;
@@ -116,7 +116,7 @@
@Autowired
private IOrderService orderService;
- @Autowired
+ @Resource
private ICompanyFundFlowService companyFundFlowService;
@Value("${wx.appletsAppid}")
@@ -174,7 +174,7 @@
int i = 0;
Double scope = 5D;
while (true){
- List<NearbyDriverWarpper> nearbyDriverWarppers = driverService.queryDriverPosition(estimatedCosts.getLng().toString(), estimatedCosts.getLat().toString(), scope);
+ List<NearbyDriverWarpper> nearbyDriverWarppers = driverService.queryDriverPosition(estimatedCosts.getStartLng().toString(), estimatedCosts.getStartLat().toString(), scope);
if(nearbyDriverWarppers.size() == 0){
scope += 5;
i++;
@@ -524,6 +524,7 @@
}
}
}
+ redisUtil.setStrValue("newOrder", "true");
return ResultUtil.success(order.getId());
}
@@ -718,6 +719,7 @@
order1.setHallOrder(1);
OrderServiceImpl.this.updateById(order1);
ExtraPushOrder(order);
+ redisUtil.setStrValue("lobbyOrder", "true");
}
}
}, num4 * 1000);
@@ -725,6 +727,7 @@
order.setHallOrder(1);
this.updateById(order);
ExtraPushOrder(order);
+ redisUtil.setStrValue("lobbyOrder", "true");
}
redisUtil.unlock();
}catch (Exception e){
@@ -814,8 +817,10 @@
PushOrderInfoWarpper pushOrderInfoWarpper = new PushOrderInfoWarpper();
pushOrderInfoWarpper.setId(order.getId());
pushOrderInfoWarpper.setState(order.getState());
+ pushOrderInfoWarpper.setCancelObject(1);
pushUtil.pushOrderInfo(order.getDriverId(), 2, pushOrderInfoWarpper);
}
+ redisUtil.setStrValue("cancelOrder", "true");
return ResultUtil.success();
}
@@ -1540,6 +1545,7 @@
CompanyFundFlow companyFundFlow = new CompanyFundFlow();
companyFundFlow.setBalance(new BigDecimal(balance));
companyFundFlow.setObjectType(1);
+ companyFundFlow.setDriverId(driver.getId());
companyFundFlow.setType(5);
companyFundFlow.setMoney(new BigDecimal(order.getDiscountedPrice()));
companyFundFlow.setCreateTime(new Date());
@@ -1589,6 +1595,7 @@
JSONObject jsonObject = JSON.parseObject(systemConfig.getContent());
Double num2 = jsonObject.getDouble("num2");
Double num3 = jsonObject.getDouble("num3");
+ Double num4_ = jsonObject.getDouble("num4");
if(order.getOrderMoney().compareTo(num2) >= 0){//订单金额大于num2开始分佣
AccountChangeDetail accountChangeDetail1 = new AccountChangeDetail();
accountChangeDetail1.setCode(System.currentTimeMillis() + UUIDUtil.getNumberRandom(5));
@@ -1990,11 +1997,60 @@
}
}
}
- //处理代理商抽佣
+ //处理平台抽佣
+ if(num4_ > 0){
+ //先平台抽佣
+ num4_ = (num3 >= num4_ ? num4_ : num3);
+ Revenue revenue = new Revenue();
+ revenue.setType(2);
+ revenue.setUserType(4);
+ revenue.setUserId(driver.getAgentId());
+ revenue.setOrderId(order.getId());
+ revenue.setAmount(num4_);
+ revenue.setCreateTime(new Date());
+ revenueService.insert(revenue);
+ //司机充值记录分账
+ Double num4_1 = num4_;
+ List<RechargeRecord> rechargeRecords = rechargeRecordService.selectList(new EntityWrapper<RechargeRecord>().eq("type", 2).eq("userId", driver.getId()).eq("payStatus", 2).gt("surplusDividedAmount", 0).orderBy("createTime"));
+ for (RechargeRecord rechargeRecord : rechargeRecords) {
+ Double surplusDividedAmount = rechargeRecord.getSurplusDividedAmount();
+ if(surplusDividedAmount.compareTo(num4_1) >= 0){
+ ResultUtil fengzhang = fengzhang(3, null, "553021440975", order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), num4_1, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(new BigDecimal(rechargeRecord.getSurplusDividedAmount()).subtract(new BigDecimal(num4_1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ rechargeRecordService.updateById(rechargeRecord);
+ }
+ break;
+ }else{
+ ResultUtil fengzhang = fengzhang(3, null, "553021440975", order.getId().longValue(), rechargeRecord.getId(), rechargeRecord.getOrderNumber(), surplusDividedAmount, 3);
+ if(10000 == fengzhang.getCode()){
+ rechargeRecord.setSurplusDividedAmount(0D);
+ rechargeRecordService.updateById(rechargeRecord);
+ num4_1 = new BigDecimal(num4_1).subtract(new BigDecimal(surplusDividedAmount)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ }else{
+ break;
+ }
+ }
+ }
+ Double balance = revenueService.queryAgentBalance(driver.getAgentId());
+ //记录企业流水
+ CompanyFundFlow companyFundFlow = new CompanyFundFlow();
+ companyFundFlow.setType(3);
+ companyFundFlow.setObjectType(1);
+ companyFundFlow.setObjectId(null);
+ companyFundFlow.setBalance(new BigDecimal(balance));
+ companyFundFlow.setMoney(new BigDecimal(num4_));
+ companyFundFlow.setCreateTime(new Date());
+ companyFundFlowService.insert(companyFundFlow);
+ double v = new BigDecimal(num3).subtract(new BigDecimal(num4_)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ num3 = (num3 >= num4_ ? v : 0);
+ }
+
+ //代理商分佣
if(num3 > 0 && null != driver){
Double balance = revenueService.queryAgentBalance(driver.getAgentId());
Revenue revenue = new Revenue();
- revenue.setType(1);
+ revenue.setType(2);
revenue.setUserType(3);
revenue.setUserId(driver.getAgentId());
revenue.setOrderId(order.getId());
@@ -2027,6 +2083,7 @@
}
}
+ //记录企业流水
CompanyFundFlow companyFundFlow = new CompanyFundFlow();
companyFundFlow.setType(3);
companyFundFlow.setObjectType(2);
@@ -2148,6 +2205,7 @@
CompanyFundFlow companyFundFlow = new CompanyFundFlow();
companyFundFlow.setBalance(new BigDecimal(balance));
companyFundFlow.setObjectType(1);
+ companyFundFlow.setDriverId(driver.getId());
companyFundFlow.setType(5);
companyFundFlow.setMoney(new BigDecimal(order.getDiscountedPrice()));
companyFundFlow.setCreateTime(new Date());
@@ -2321,6 +2379,7 @@
CompanyFundFlow companyFundFlow = new CompanyFundFlow();
companyFundFlow.setBalance(new BigDecimal(balance));
companyFundFlow.setObjectType(1);
+ companyFundFlow.setDriverId(driver.getId());
companyFundFlow.setType(5);
companyFundFlow.setMoney(new BigDecimal(order.getDiscountedPrice()));
companyFundFlow.setCreateTime(new Date());
--
Gitblit v1.7.1