qzz/electripper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.合伙人分账功能

Browse Source
This commit is contained in:
邱贞招 2024-10-21 09:33:52 +08:00
parent ae3cea85b4
commit 2b01d14ea5
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
electripper-common/src/main/java/com/ruoyi/common/constant/ServiceConstants.java
View File

@ -283,7 +283,7 @@ public class ServiceConstants {
public static final String VEHICLE_STATUS_OFFLINE = "0"; public static final String VEHICLE_STATUS_OFFLINE = "0";
/** /**
* 在线状态: 0-在线 * 在线状态: 1-在线
*/ */
public static final String VEHICLE_STATUS_ONLINE = "1"; public static final String VEHICLE_STATUS_ONLINE = "1";

4
electripper-system/src/main/java/com/ruoyi/system/service/impl/EtOrderServiceImpl.java
View File

@ -535,7 +535,7 @@ public class EtOrderServiceImpl implements IEtOrderService
} }
}else{ }else{
TmTradeInfo tradeInfo = paymentResult.getTradeInfo(); TmTradeInfo tradeInfo = paymentResult.getTradeInfo();
if(PayStatus.isSuccess(tradeInfo.getPayStatus().getCode())) { if(tradeInfo.getPayStatus()!=null && PayStatus.isSuccess(tradeInfo.getPayStatus().getCode())) {
handleSuccess(order); handleSuccess(order);
return 1; return 1;
}else{ }else{
@ -1859,7 +1859,7 @@ public class EtOrderServiceImpl implements IEtOrderService
if(ObjectUtil.isNotNull(ridingFee) && !ridingFee.equals(BigDecimal.ZERO)){ if(ObjectUtil.isNotNull(ridingFee) && !ridingFee.equals(BigDecimal.ZERO)){
refundAmount = refundAmount.add(ridingFee); refundAmount = refundAmount.add(ridingFee);
} }
BigDecimal refundPercentage = refundAmount.divide(etOrder1.getPayFee()).setScale(2, RoundingMode.HALF_UP);// 0.33 BigDecimal refundPercentage = refundAmount.divide(etOrder1.getPayFee(), 2, RoundingMode.HALF_UP);// 0.33
// 合伙人退款 // 合伙人退款
BigDecimal totalPartnerDividend = partnerRefund(etOrder, etOrder1, refundPercentage); BigDecimal totalPartnerDividend = partnerRefund(etOrder, etOrder1, refundPercentage);
log.info("【合伙人退款】：总金额【{}】", totalPartnerDividend); log.info("【合伙人退款】：总金额【{}】", totalPartnerDividend);

1
electripper-system/src/main/resources/mapper/system/EtLocationLogMapper.xml
View File

@ -34,6 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="status != null and status != ''"> and status = #{status}</if> <if test="status != null and status != ''"> and status = #{status}</if>
<if test="lockStatus != null and lockStatus != ''"> and lock_status = #{lockStatus}</if> <if test="lockStatus != null and lockStatus != ''"> and lock_status = #{lockStatus}</if>
</where> </where>
order by create_time desc
</select> </select>
<select id="selectEtLocationLogListByCreateTime" parameterType="EtLocationLog" resultMap="EtLocationLogResult"> <select id="selectEtLocationLogListByCreateTime" parameterType="EtLocationLog" resultMap="EtLocationLogResult">

1
electripper-system/src/main/resources/mapper/system/EtModelMapper.xml
View File

@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="areaId != null and areaId != ''"> and m.area_id = #{areaId}</if> <if test="areaId != null and areaId != ''"> and m.area_id = #{areaId}</if>
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
${params.dataScope} ${params.dataScope}
order by m.create_time desc
</select> </select>
<select id="selectEtModelByModelId" parameterType="Long" resultMap="EtModelResult"> <select id="selectEtModelByModelId" parameterType="Long" resultMap="EtModelResult">