From 656ac293601d6da08d25e892a79604fe3edcd086 Mon Sep 17 00:00:00 2001
From: zhibing.pu <393733352@qq.com>
Date: 星期四, 01 八月 2024 16:04:46 +0800
Subject: [PATCH] 修改2.0 bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SettlementRecordServiceImpl.java | 97 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 83 insertions(+), 14 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SettlementRecordServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SettlementRecordServiceImpl.java
index d43c54e..9f5e3ce 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SettlementRecordServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/SettlementRecordServiceImpl.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.dao.SettlementRecordMapper;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
@@ -14,11 +15,14 @@
import com.stylefeng.guns.modular.system.warpper.QueryHistoricalSettlement;
import com.stylefeng.guns.modular.system.warpper.QuerySettlementAmount;
import com.stylefeng.guns.modular.system.warpper.QuerySettlementAmountDetails;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -46,6 +50,9 @@
@Value("${callbackPath}")
private String callbackPath;//支付回调网关地址
+
+ @Resource
+ private IBalanceUsageRecordService balanceUsageRecordService;
@@ -150,23 +157,53 @@
Double laveActivityMoney = driver1.getLaveActivityMoney();
Double laveBusinessMoney = driver1.getLaveBusinessMoney();
- if(laveBusinessMoney.compareTo(payMoney) < 0){
- driver1.setLaveBusinessMoney(0D);
- BigDecimal m = new BigDecimal(payMoney).subtract(new BigDecimal(laveBusinessMoney));
- driver1.setLaveActivityMoney(new BigDecimal(laveActivityMoney).subtract(m).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
- }else{
- driver1.setLaveBusinessMoney(new BigDecimal(laveBusinessMoney).subtract(new BigDecimal(payMoney)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ //活动余额小于结算金额
+ if(null != laveActivityMoney && 0 < laveActivityMoney && laveActivityMoney.compareTo(payMoney) < 0){
+ driver1.setLaveActivityMoney(0D);
+ BigDecimal m = new BigDecimal(payMoney).subtract(new BigDecimal(laveActivityMoney)).setScale(2, RoundingMode.HALF_EVEN);
+ driver1.setLaveBusinessMoney(new BigDecimal(laveBusinessMoney).subtract(m).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ settlementRecord.setPayMoney(laveActivityMoney);
+ settlementRecord.setPaymentStatus(2);
+ settlementRecord.setPayType(payType);
+ settlementRecord.setBalanceType(1);
+ settlementRecord.setPayTime(new Date());
+ this.updateById(settlementRecord);
+ balanceUsageRecordService.saveBalanceUsageRecord(settlementRecord.getDriverId(), 1, laveActivityMoney, settlementRecord.getType() + 2);
+ balanceUsageRecordService.saveBalanceUsageRecord(settlementRecord.getDriverId(), 2, m.doubleValue(), settlementRecord.getType() + 2);
+
+ SettlementRecord settlementRecord1 = new SettlementRecord();
+ BeanUtils.copyProperties(settlementRecord, settlementRecord1);
+ settlementRecord1.setId(null);
+ settlementRecord1.setPayMoney(m.doubleValue());
+ settlementRecord1.setBalanceType(2);
+ this.insert(settlementRecord1);
}
+ //活动余额大于结算金额
+ if(null != laveActivityMoney && 0 < laveActivityMoney && laveActivityMoney.compareTo(payMoney) >= 0){
+ driver1.setLaveActivityMoney(new BigDecimal(laveActivityMoney).subtract(new BigDecimal(payMoney)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ settlementRecord.setPaymentStatus(2);
+ settlementRecord.setPayType(payType);
+ settlementRecord.setBalanceType(1);
+ settlementRecord.setPayTime(new Date());
+ this.updateById(settlementRecord);
+ balanceUsageRecordService.saveBalanceUsageRecord(settlementRecord.getDriverId(), 1, payMoney, settlementRecord.getType() + 2);
+ }
+ if(null == laveActivityMoney || 0 == laveActivityMoney){
+ driver1.setLaveActivityMoney(0D);
+ driver1.setLaveBusinessMoney(new BigDecimal(laveBusinessMoney).subtract(new BigDecimal(payMoney)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
+ settlementRecord.setPaymentStatus(2);
+ settlementRecord.setPayType(payType);
+ settlementRecord.setBalanceType(2);
+ settlementRecord.setPayTime(new Date());
+ this.updateById(settlementRecord);
+ balanceUsageRecordService.saveBalanceUsageRecord(settlementRecord.getDriverId(), 2, payMoney, settlementRecord.getType() + 2);
+ }
+
driver1.setBalance(new BigDecimal(driver1.getBalance()).subtract(new BigDecimal(payMoney)).setScale(2, BigDecimal.ROUND_HALF_EVEN).doubleValue());
//添加交易明细
transactionDetailsService.saveData(driverId, "线下结算", payMoney, 2, 1, 2, null, null);
driverService.updateById(driver1);
-
- settlementRecord.setPaymentStatus(2);
- settlementRecord.setPayType(payType);
- settlementRecord.setPayTime(new Date());
- this.updateById(settlementRecord);
return ResultUtil.success("");
}
return resultUtil;
@@ -179,9 +216,40 @@
* @return
*/
@Override
- public List<QueryHistoricalSettlement> queryHistoricalSettlement(Integer driverId, Integer pageNum, Integer size) {
+ public List<QueryHistoricalSettlement> queryHistoricalSettlement(Integer language, Integer driverId, Integer pageNum, Integer size) {
pageNum = (pageNum - 1) * size;
- return this.baseMapper.queryHistoricalSettlement(driverId, pageNum, size);
+ List<Map<String, Object>> list = this.baseMapper.queryHistoricalSettlement(driverId, pageNum, size);
+ Double aDouble = this.baseMapper.queryHistoricalSettlementTotal(driverId);
+ List<QueryHistoricalSettlement> datas = new ArrayList<>();
+ for (Map<String, Object> map : list) {
+ QueryHistoricalSettlement queryHistoricalSettlement = new QueryHistoricalSettlement();
+ if(null != map.get("createTime")){
+ queryHistoricalSettlement.setCreateTime(DateUtil.conversionFormat(language, map.get("createTime").toString()));
+ }
+ if(null != map.get("price")){
+ queryHistoricalSettlement.setPrice(Double.valueOf(map.get("price").toString()));
+ }
+ if(null != map.get("type")){
+ queryHistoricalSettlement.setType(Integer.valueOf(map.get("type").toString()));
+ }
+ if(null != map.get("payType")){
+ switch (map.get("payType").toString()){
+ case "1":
+ queryHistoricalSettlement.setPayType(language == 1 ? "手机支付" : language == 2 ? "Mobile Money" : "Paiement mobile");
+ break;
+ case "2":
+ queryHistoricalSettlement.setPayType(language == 1 ? "线上支付" : language == 2 ? "Bank Card" : "Carte bancaire");
+ break;
+ default:
+ Integer balanceType = Integer.valueOf(map.get("balanceType").toString());
+ queryHistoricalSettlement.setPayType(language == 1 ? "余额支付(" + (balanceType == 1 ? "奖励" : "收入") + ")" : language == 2 ? "Wallet (" + (balanceType == 1 ? "Reward" : "Income") + ")" : "Portefeuille (" + (balanceType == 1 ? "Récompense" : "Revenu") + ")");
+ break;
+ }
+ }
+ queryHistoricalSettlement.setTotalPrice(aDouble);
+ datas.add(queryHistoricalSettlement);
+ }
+ return datas;
}
@@ -209,11 +277,11 @@
w = w == 1 ? 7 : w - 1;
int d = today.get(Calendar.DAY_OF_MONTH);
if(null != settlementAllocation){
- List<Map<String, Object>> list = settlementDetailService.queryGroupDriver();
JSONObject jsonObject = JSON.parseObject(settlementAllocation.getContent());
Integer type = jsonObject.getInteger("type");
Integer day = jsonObject.getInteger("day");
if(type == 2 && w == day){//周结算
+ List<Map<String, Object>> list = settlementDetailService.queryGroupDriver();
for (Map<String, Object> map : list) {
Integer driverId = Integer.valueOf(map.get("driverId").toString());
Double price = Double.valueOf(map.get("price").toString());
@@ -237,6 +305,7 @@
}
}
if(type == 3 && d == day){//月结算
+ List<Map<String, Object>> list = settlementDetailService.queryGroupDriver();
for (Map<String, Object> map : list) {
Integer driverId = Integer.valueOf(map.get("driverId").toString());
Double price = Double.valueOf(map.get("price").toString());
--
Gitblit v1.7.1