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

修改支付多出的数据，取消删除redis数据

Browse Source
This commit is contained in:
yuyang 2021-11-16 19:58:00 +08:00
parent dab1aeabc0
commit a30e3cdb44
6 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/api/XhpcPileOrderController.java
View File

@ -364,9 +364,9 @@ public class XhpcPileOrderController extends BaseController {
R.ok(); R.ok();
} }
}else{ }else{
Map<String, Object> pushOrder = redisService.getCacheMap("pushOrder:"+orderNo); // Map<String, Object> pushOrder = redisService.getCacheMap("pushOrder:"+orderNo);
xhpcHistoryOrder.setInternetSerialNumber(pushOrder.get("internetSerialNumber").toString()); // xhpcHistoryOrder.setInternetSerialNumber(pushOrder.get("internetSerialNumber").toString());
xhpcChargeOrder.setOperatorId3rdptyEvcs((String) pushOrder.get("operatorId3rdpty")); // xhpcChargeOrder.setOperatorId3rdptyEvcs((String) pushOrder.get("operatorId3rdpty"));
} }
//结算 //结算

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

@ -443,7 +443,7 @@ public class XhpcRealTimeOrderServiceImpl implements IXhpcRealTimeOrderService {
xhpcChargeOrderService.updateXhpcChargeOrder(xhpcChargeOrder); xhpcChargeOrderService.updateXhpcChargeOrder(xhpcChargeOrder);
redisService.deleteObject("pushOrder:"+xhpcChargeOrder.getSerialNumber()); // redisService.deleteObject("pushOrder:"+xhpcChargeOrder.getSerialNumber());
} }

1
xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/AlipayPaymentController.java
View File

@ -274,6 +274,7 @@ public class AlipayPaymentController {
xhpcUserAccountStatement.setAmount(xhpcRechargeOrder.getAmount()); xhpcUserAccountStatement.setAmount(xhpcRechargeOrder.getAmount());
xhpcUserAccountStatement.setRemainingSum(xhpcAppUser.getBalance()); xhpcUserAccountStatement.setRemainingSum(xhpcAppUser.getBalance());
xhpcUserAccountStatement.setCreateTime(new Date()); xhpcUserAccountStatement.setCreateTime(new Date());
xhpcUserAccountStatement.setRemark("支付宝充值订单！");
xhpcUserAccountStatementMapper.insert(xhpcUserAccountStatement); xhpcUserAccountStatementMapper.insert(xhpcUserAccountStatement);
} }
} }

1
xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/controller/WxPaymentController.java
View File

@ -386,6 +386,7 @@ public class WxPaymentController {
xhpcUserAccountStatement.setAmount(xhpcRechargeOrder.getAmount()); xhpcUserAccountStatement.setAmount(xhpcRechargeOrder.getAmount());
xhpcUserAccountStatement.setRemainingSum(xhpcAppUser.getBalance()); xhpcUserAccountStatement.setRemainingSum(xhpcAppUser.getBalance());
xhpcUserAccountStatement.setCreateTime(new Date()); xhpcUserAccountStatement.setCreateTime(new Date());
xhpcUserAccountStatement.setRemark("微信充值订单！");
xhpcUserAccountStatementMapper.insert(xhpcUserAccountStatement); xhpcUserAccountStatementMapper.insert(xhpcUserAccountStatement);
} }
} }

14
xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcRechargeOrderServiceImpl.java
View File

@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -87,6 +88,7 @@ public class XhpcRechargeOrderServiceImpl implements IXhpcRechargeOrderService {
xhpcRechargeOrder.setAmount(amount); xhpcRechargeOrder.setAmount(amount);
xhpcRechargeOrder.setRechargeOrderNumber(orderNumber); xhpcRechargeOrder.setRechargeOrderNumber(orderNumber);
xhpcRechargeOrder.setType(Integer.parseInt(type)); xhpcRechargeOrder.setType(Integer.parseInt(type));
xhpcRechargeOrder.setCreateTime(new Date());
xhpcRechargeOrderMapper.insert(xhpcRechargeOrder); xhpcRechargeOrderMapper.insert(xhpcRechargeOrder);
return xhpcRechargeOrder; return xhpcRechargeOrder;
} }
@ -110,12 +112,12 @@ public class XhpcRechargeOrderServiceImpl implements IXhpcRechargeOrderService {
} else { } else {
xhpcRechargeOrder.setAlipayNumber(paymentNumber); xhpcRechargeOrder.setAlipayNumber(paymentNumber);
} }
if (StatusConstants.RECHARGE_ORDER_STATUS_SUCCESS == xhpcRechargeOrder.getStatus()) { // if (StatusConstants.RECHARGE_ORDER_STATUS_SUCCESS == xhpcRechargeOrder.getStatus()) {
Map<String, Object> map = xhpcRechargeOrderMapper.info(rechargeOrderId); // Map<String, Object> map = xhpcRechargeOrderMapper.info(rechargeOrderId);
String amount = StringUtils.valueOf(map.get("amount")); // String amount = StringUtils.valueOf(map.get("amount"));
String userId = StringUtils.valueOf(map.get("userId")); // String userId = StringUtils.valueOf(map.get("userId"));
xhpcUserAccountStatementService.add(rechargeOrderId, amount, userId, Integer.parseInt(type)); // xhpcUserAccountStatementService.add(rechargeOrderId, amount, userId, Integer.parseInt(type));
} // }
xhpcRechargeOrderMapper.update(xhpcRechargeOrder); xhpcRechargeOrderMapper.update(xhpcRechargeOrder);
} }

9
xhpc-modules/xhpc-payment/src/main/java/com/xhpc/payment/service/impl/XhpcUserAccountStatementServiceImpl.java
View File

@ -10,6 +10,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -72,6 +73,14 @@ public class XhpcUserAccountStatementServiceImpl implements IXhpcUserAccountStat
BigDecimal surplus = BigDecimal.valueOf(Double.valueOf(balance)).subtract(BigDecimal.valueOf(Double.valueOf(balance))); BigDecimal surplus = BigDecimal.valueOf(Double.valueOf(balance)).subtract(BigDecimal.valueOf(Double.valueOf(balance)));
xhpcUserAccountStatement.setRemainingSum(surplus); xhpcUserAccountStatement.setRemainingSum(surplus);
} }
xhpcUserAccountStatement.setCreateTime(new Date());
if(type==1){
xhpcUserAccountStatement.setRemark("充值订单！！！");
}else if(type==2){
xhpcUserAccountStatement.setRemark("退款订单！！！");
}else{
xhpcUserAccountStatement.setRemark("充电订单！！！");
}
xhpcUserAccountStatementMapper.insert(xhpcUserAccountStatement); xhpcUserAccountStatementMapper.insert(xhpcUserAccountStatement);
} }