|
|
|
@@ -743,7 +743,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
|
if ("MICROPAY".equals(tradeType)) { |
|
|
|
handleMicroOrderPaySuccess(record, transactionId, openId, sub_is_subscribe); |
|
|
|
} else { |
|
|
|
handleOrderPaySuccess(record, transactionId); |
|
|
|
handleOrderPaySuccess(record, transactionId, EnumPayFrom.QUERY.getCode()); |
|
|
|
} |
|
|
|
return new ResultData(Result.SUCCESS, "订单支付成功", returnMap); |
|
|
|
} else if ("REFUND".equals(trade_state)) { |
|
|
|
@@ -1144,9 +1144,10 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
|
timeEnd = new Date(); |
|
|
|
} |
|
|
|
payOrder.setPayTimeEnd(timeEnd); |
|
|
|
payOrder.setPayEndFrom(EnumPayFrom.CALLBACK.getCode()); |
|
|
|
|
|
|
|
// 处理支付成功 |
|
|
|
handleOrderPaySuccess(payOrder, paramMap.get("transaction_id")); |
|
|
|
handleOrderPaySuccess(payOrder, paramMap.get("transaction_id"), EnumPayFrom.CALLBACK.getCode()); |
|
|
|
logger.info("notify order, wxpay checksign success, paramMap:{}, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); |
|
|
|
SortedMap resultMap = new TreeMap(); |
|
|
|
resultMap.put("return_code", "SUCCESS"); |
|
|
|
@@ -1164,14 +1165,9 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
|
return XmlUtil.getRequestXml(resultMap); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public void callback(Map<String, String> paramMap, EnumPayWay payWay) { |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
@Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) |
|
|
|
public void handleOrderPaySuccess(WxPayOrder record, String transactionId) { |
|
|
|
public void handleOrderPaySuccess(WxPayOrder record, String transactionId, Integer from) { // from 0:callback, 1:query |
|
|
|
Date currentDate = new Date(); |
|
|
|
EnumPayStatus payStatus = EnumPayStatus.getEnum(record.getPayOrderStatus()); |
|
|
|
// 判断支付状态 |
|
|
|
|