mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-07-06 06:57:59 +08:00
update订单逻辑改造工厂模式
This commit is contained in:
@@ -116,21 +116,17 @@ public abstract class AbstractOrderLogic implements InitializingBean {
|
|||||||
/**
|
/**
|
||||||
* 订单结算
|
* 订单结算
|
||||||
*/
|
*/
|
||||||
public abstract void orderSettle(TransactionRecordsData data, OrderBasicInfo orderBasicInfo);
|
public abstract void settleOrder(TransactionRecordsData data, OrderBasicInfo orderBasicInfo);
|
||||||
|
|
||||||
/**
|
|
||||||
* 订单退款
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 余额支付订单退款
|
* 余额支付订单退款
|
||||||
*/
|
*/
|
||||||
public abstract void balancePaymentOrderRefund(OrderBasicInfo orderBasicInfo);
|
// public abstract void balancePaymentOrderRefund(OrderBasicInfo orderBasicInfo);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 在线支付订单退款
|
* 在线支付订单退款
|
||||||
*/
|
*/
|
||||||
public abstract void onlinePaymentOrderRefund(OrderBasicInfo orderBasicInfo);
|
// public abstract void onlinePaymentOrderRefund(OrderBasicInfo orderBasicInfo);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 订单支付成功 支付回调
|
* 订单支付成功 支付回调
|
||||||
|
|||||||
@@ -242,7 +242,7 @@ public class DelayMerchantOrderLogic extends AbstractOrderLogic {
|
|||||||
* 订单结算
|
* 订单结算
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void orderSettle(TransactionRecordsData data, OrderBasicInfo orderBasicInfo) {
|
public void settleOrder(TransactionRecordsData data, OrderBasicInfo orderBasicInfo) {
|
||||||
logger.info("{}-结算订单start data:{}, orderBasicInfo:{}", this.getClass().getSimpleName(), data.toString(), JSON.toJSONString(orderBasicInfo));
|
logger.info("{}-结算订单start data:{}, orderBasicInfo:{}", this.getClass().getSimpleName(), data.toString(), JSON.toJSONString(orderBasicInfo));
|
||||||
// 判断订单状态
|
// 判断订单状态
|
||||||
if (StringUtils.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.ORDER_COMPLETE.getValue())) {
|
if (StringUtils.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.ORDER_COMPLETE.getValue())) {
|
||||||
@@ -337,8 +337,7 @@ public class DelayMerchantOrderLogic extends AbstractOrderLogic {
|
|||||||
/**
|
/**
|
||||||
* 余额支付订单退款
|
* 余额支付订单退款
|
||||||
*/
|
*/
|
||||||
@Override
|
private void balancePaymentOrderRefund(OrderBasicInfo orderBasicInfo) {
|
||||||
public void balancePaymentOrderRefund(OrderBasicInfo orderBasicInfo) {
|
|
||||||
logger.info("{}-余额支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo));
|
logger.info("{}-余额支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo));
|
||||||
// 订单编号
|
// 订单编号
|
||||||
String orderCode = orderBasicInfo.getOrderCode();
|
String orderCode = orderBasicInfo.getOrderCode();
|
||||||
@@ -382,8 +381,7 @@ public class DelayMerchantOrderLogic extends AbstractOrderLogic {
|
|||||||
/**
|
/**
|
||||||
* 在线支付订单退款
|
* 在线支付订单退款
|
||||||
*/
|
*/
|
||||||
@Override
|
private void onlinePaymentOrderRefund(OrderBasicInfo orderBasicInfo) {
|
||||||
public void onlinePaymentOrderRefund(OrderBasicInfo orderBasicInfo) {
|
|
||||||
logger.info("{}-在线支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo));
|
logger.info("{}-在线支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo));
|
||||||
// 订单编号
|
// 订单编号
|
||||||
String orderCode = orderBasicInfo.getOrderCode();
|
String orderCode = orderBasicInfo.getOrderCode();
|
||||||
|
|||||||
@@ -225,7 +225,7 @@ public class NotDelayMerchantOrderLogic extends AbstractOrderLogic{
|
|||||||
* @param orderBasicInfo
|
* @param orderBasicInfo
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public void orderSettle(TransactionRecordsData data, OrderBasicInfo orderBasicInfo) {
|
public void settleOrder(TransactionRecordsData data, OrderBasicInfo orderBasicInfo) {
|
||||||
logger.info("{}-结算订单start data:{}, orderBasicInfo:{}", this.getClass().getSimpleName(), data.toString(), JSON.toJSONString(orderBasicInfo));
|
logger.info("{}-结算订单start data:{}, orderBasicInfo:{}", this.getClass().getSimpleName(), data.toString(), JSON.toJSONString(orderBasicInfo));
|
||||||
// 判断订单状态
|
// 判断订单状态
|
||||||
if (StringUtils.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.ORDER_COMPLETE.getValue())) {
|
if (StringUtils.equals(orderBasicInfo.getOrderStatus(), OrderStatusEnum.ORDER_COMPLETE.getValue())) {
|
||||||
@@ -322,8 +322,7 @@ public class NotDelayMerchantOrderLogic extends AbstractOrderLogic{
|
|||||||
*
|
*
|
||||||
* @param orderBasicInfo
|
* @param orderBasicInfo
|
||||||
*/
|
*/
|
||||||
@Override
|
private void balancePaymentOrderRefund(OrderBasicInfo orderBasicInfo) {
|
||||||
public void balancePaymentOrderRefund(OrderBasicInfo orderBasicInfo) {
|
|
||||||
logger.info("{}-余额支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo));
|
logger.info("{}-余额支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo));
|
||||||
// 订单编号
|
// 订单编号
|
||||||
String orderCode = orderBasicInfo.getOrderCode();
|
String orderCode = orderBasicInfo.getOrderCode();
|
||||||
@@ -375,8 +374,7 @@ public class NotDelayMerchantOrderLogic extends AbstractOrderLogic{
|
|||||||
*
|
*
|
||||||
* @param orderBasicInfo
|
* @param orderBasicInfo
|
||||||
*/
|
*/
|
||||||
@Override
|
private void onlinePaymentOrderRefund(OrderBasicInfo orderBasicInfo) {
|
||||||
public void onlinePaymentOrderRefund(OrderBasicInfo orderBasicInfo) {
|
|
||||||
logger.info("{}-在线支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo));
|
logger.info("{}-在线支付订单退款start orderBasicInfo:{}", this.getClass().getSimpleName(), JSON.toJSONString(orderBasicInfo));
|
||||||
// 订单编号
|
// 订单编号
|
||||||
String orderCode = orderBasicInfo.getOrderCode();
|
String orderCode = orderBasicInfo.getOrderCode();
|
||||||
|
|||||||
Reference in New Issue
Block a user