|
|
|
@@ -724,7 +724,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
|
if ("MICROPAY".equals(tradeType)) { |
|
|
|
handleMicroOrderPaySuccess(record, transactionId, openId, sub_is_subscribe); |
|
|
|
} else { |
|
|
|
handleOrderPaySuccess(record, transactionId, EnumPayFrom.QUERY.getCode()); |
|
|
|
handleOrderPaySuccess(record, transactionId, EnumPayEndFrom.QUERY.getCode()); |
|
|
|
} |
|
|
|
return new ResultData(Result.SUCCESS, "订单支付成功", returnMap); |
|
|
|
} else if ("REFUND".equals(trade_state)) { |
|
|
|
@@ -1125,10 +1125,10 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
|
timeEnd = new Date(); |
|
|
|
} |
|
|
|
payOrder.setPayTimeEnd(timeEnd); |
|
|
|
payOrder.setPayEndFrom(EnumPayFrom.CALLBACK.getCode()); |
|
|
|
payOrder.setPayEndFrom(EnumPayEndFrom.CALLBACK.getCode()); |
|
|
|
|
|
|
|
// 处理支付成功 |
|
|
|
handleOrderPaySuccess(payOrder, paramMap.get("transaction_id"), EnumPayFrom.CALLBACK.getCode()); |
|
|
|
handleOrderPaySuccess(payOrder, paramMap.get("transaction_id"), EnumPayEndFrom.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"); |
|
|
|
|