Sfoglia il codice sorgente

更新微信支付

release_toaliyun_real
xiaohanzi 6 anni fa
parent
commit
bba6d4fd79
2 ha cambiato i file con 11 aggiunte e 5 eliminazioni
  1. +8
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java

+ 8
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java Vedi File

@@ -152,10 +152,16 @@ public class WxPayOrderController extends BaseController {
} }
WxPayAccount payAccount = wxPayAccountService.getById(appInfo.getPayId()); WxPayAccount payAccount = wxPayAccountService.getById(appInfo.getPayId());
order = wxOrderService.getById(orderId); order = wxOrderService.getById(orderId);
WxPayOrder wo = wxPayOrderService.handleWxOrderQuery(payOrder, order, appInfo, payAccount, IdWorker.get());
if (null != wo) {
try {
WxPayOrder wo = wxPayOrderService.handleWxOrderQuery(payOrder, order, appInfo, payAccount, IdWorker.get());
if (null != wo) {
return new ResultData(Result.SUCCESS, "支付状态更新成功", order);
}
}catch(MallinkException e) {
//已经同步了微信的支付状态,表示已经更新
return new ResultData(Result.SUCCESS, "支付状态更新成功", order); return new ResultData(Result.SUCCESS, "支付状态更新成功", order);
} }

return new ResultData(ErrorCode.PAY_ORDER_ERROR, "查询微信订单支付状态失败,请稍后!"); return new ResultData(ErrorCode.PAY_ORDER_ERROR, "查询微信订单支付状态失败,请稍后!");
} }
} else if (status.equals(EnumPayStatus.PAY_STATUS_FAIL.getCode())) { } else if (status.equals(EnumPayStatus.PAY_STATUS_FAIL.getCode())) {


+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java Vedi File

@@ -189,7 +189,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS.getCode()); order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS.getCode());
wxOrderMapper.updateById(order); wxOrderMapper.updateById(order);
} }
throw new MallinkException(ErrorCode.PAY_ORDER_PAYING.getCode(),"该订单已经退款,无法支付!");
throw new MallinkException(ErrorCode.PAY_ORDER_REFUND.getCode(),"该订单已经退款,无法支付!");
}else if (EnumPayStatus.PAY_STATUS_CLOSE.getCode()==wxpaystatus) { }else if (EnumPayStatus.PAY_STATUS_CLOSE.getCode()==wxpaystatus) {
if (oldRecord.getPayOrderStatus() != EnumPayStatus.PAY_STATUS_CLOSE.getCode()) { if (oldRecord.getPayOrderStatus() != EnumPayStatus.PAY_STATUS_CLOSE.getCode()) {
oldRecord.setPayOrderStatus(EnumPayStatus.PAY_STATUS_CLOSE.getCode()); oldRecord.setPayOrderStatus(EnumPayStatus.PAY_STATUS_CLOSE.getCode());
@@ -199,7 +199,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL.getCode()); order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL.getCode());
wxOrderMapper.updateById(order); wxOrderMapper.updateById(order);
} }
throw new MallinkException(ErrorCode.PAY_ORDER_PAYING.getCode(),"该订单已经关闭,无法支付!");
throw new MallinkException(ErrorCode.PAY_ORDER_CLOSED.getCode(),"该订单已经关闭,无法支付!");
}else if (EnumPayStatus.PAY_STATUS_REVERSE.getCode()==wxpaystatus) { }else if (EnumPayStatus.PAY_STATUS_REVERSE.getCode()==wxpaystatus) {
if (oldRecord.getPayOrderStatus() != EnumPayStatus.PAY_STATUS_REVERSE.getCode()) { if (oldRecord.getPayOrderStatus() != EnumPayStatus.PAY_STATUS_REVERSE.getCode()) {
oldRecord.setPayOrderStatus(EnumPayStatus.PAY_STATUS_REVERSE.getCode()); oldRecord.setPayOrderStatus(EnumPayStatus.PAY_STATUS_REVERSE.getCode());
@@ -209,7 +209,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL.getCode()); order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL.getCode());
wxOrderMapper.updateById(order); wxOrderMapper.updateById(order);
} }
throw new MallinkException(ErrorCode.PAY_ORDER_PAYING.getCode(),"该订单已撤销,无法支付!");
throw new MallinkException(ErrorCode.PAY_ORDER_REVERSE.getCode(),"该订单已撤销,无法支付!");
}else if (EnumPayStatus.PAY_STATUS_WAIT.getCode()==wxpaystatus) { }else if (EnumPayStatus.PAY_STATUS_WAIT.getCode()==wxpaystatus) {
throw new MallinkException(ErrorCode.PAY_ORDER_PAYING.getCode(),"该订单支付中,请勿重复支付!"); throw new MallinkException(ErrorCode.PAY_ORDER_PAYING.getCode(),"该订单支付中,请勿重复支付!");
}else if (EnumPayStatus.PAY_STATUS_NOTPAY.getCode()==wxpaystatus || EnumPayStatus.PAY_STATUS_FAIL.getCode()==wxpaystatus) { }else if (EnumPayStatus.PAY_STATUS_NOTPAY.getCode()==wxpaystatus || EnumPayStatus.PAY_STATUS_FAIL.getCode()==wxpaystatus) {


Caricamento…
Annulla
Salva