yuyang/XH-Power-Cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

历史订单增加订单来源

Browse Source
This commit is contained in:
2265829957@qq.com 2021-12-01 09:41:37 +08:00
parent 94553d7a73
commit 69266af1fd
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/service/impl/XhpcRealTimeOrderServiceImpl.java
View File

@ -355,6 +355,9 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService {
if(operatorIdEvcs.get("operatorIdEvcs")!=null && operatorIdEvcs.get("commissionType")!=null && operatorIdEvcs.get("commissionRate")!=null){ if(operatorIdEvcs.get("operatorIdEvcs")!=null && operatorIdEvcs.get("commissionType")!=null && operatorIdEvcs.get("commissionRate")!=null){
BigDecimal commissionRate = new BigDecimal(operatorIdEvcs.get("commissionRate").toString()).divide(new BigDecimal(100)); BigDecimal commissionRate = new BigDecimal(operatorIdEvcs.get("commissionRate").toString()).divide(new BigDecimal(100));
String commissionType = operatorIdEvcs.get("commissionType").toString(); String commissionType = operatorIdEvcs.get("commissionType").toString();
if(operatorIdEvcs.get("internetUserId") !=null){
xhpcHistoryOrder.setChargingMode(operatorIdEvcs.get("internetUserId").toString());
}
//0总金额提成 1服务费提成 //0总金额提成 1服务费提成
if(new BigDecimal(0).compareTo(commissionRate)==-1){ if(new BigDecimal(0).compareTo(commissionRate)==-1){
if("0".equals(commissionType) || "1".equals(commissionType)){ if("0".equals(commissionType) || "1".equals(commissionType)){
@ -466,6 +469,12 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService {
//剩下的钱 //剩下的钱
surplusServicePrice = surplusServicePrice.subtract(multiply2); surplusServicePrice = surplusServicePrice.subtract(multiply2);
} }
if("微信".equals(xhpcChargeOrder.getChargingMode())){
xhpcHistoryOrder.setChargingMode("微信");
}
if("支付宝".equals(xhpcChargeOrder.getChargingMode())){
xhpcHistoryOrder.setChargingMode("支付宝");
}
}else{ }else{
//订单异常 //订单异常
xhpcChargeOrder.setStatus(2); xhpcChargeOrder.setStatus(2);

1
xhpc-modules/xhpc-order/src/main/resources/mapper/XhpcRealTimeOrderMapper.xml
View File

@ -615,6 +615,7 @@
<select id="getOperatorIdEvcs" resultType="map"> <select id="getOperatorIdEvcs" resultType="map">
select select
internet_user_id as internetUserId,
operator_id_evcs as operatorIdEvcs, operator_id_evcs as operatorIdEvcs,
commission_type as commissionType, commission_type as commissionType,
commission_rate as commissionRate commission_rate as commissionRate