|
|
|
@@ -650,6 +650,12 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
|
try { |
|
|
|
if (StringUtils.isBlank(record.getPayOrderNo())) |
|
|
|
record.setPayOrderNo(String.valueOf(record.getId())); |
|
|
|
|
|
|
|
WxPayOrder payOrder = wxPayOrderMapper.selectByPrimaryKey(record.getId()); |
|
|
|
if(payOrder != null) { |
|
|
|
record.setPayOrderStatus(payOrder.getPayOrderStatus()); |
|
|
|
} |
|
|
|
|
|
|
|
String response = wechatPayOrderQuery(appInfo, record); |
|
|
|
|
|
|
|
logger.info("pay order query, " + record.toString() + ", response: " + response); |
|
|
|
@@ -927,9 +933,9 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
|
order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_OVERTIME_CANCEL.getCode()); |
|
|
|
order.setUpdateDate(new Date()); |
|
|
|
try { |
|
|
|
wxPayOrderMapper.updateByPrimaryKeySelective(record); |
|
|
|
wxOrderMapper.updateByPrimaryKeySelective(order); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error("pay order update error: " + record.toString()); |
|
|
|
logger.error("order update error: " + record.toString()); |
|
|
|
throw new MallinkException(ErrorCode.DB_FAIL); |
|
|
|
} |
|
|
|
return new ResultData(Result.SUCCESS, "订单撤销成功", returnMap); |
|
|
|
@@ -1171,6 +1177,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
|
try { |
|
|
|
record.setUpdateTime(currentDate); |
|
|
|
record.setTransactionId(transactionId); |
|
|
|
record.setFailReason(""); |
|
|
|
wxPayOrderMapper.updateByPrimaryKeySelective(record); |
|
|
|
} catch (Exception e) { |
|
|
|
logger.error(e.getMessage()); |
|
|
|
@@ -1212,9 +1219,11 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
|
WxPayOrder updateOrder = new WxPayOrder(); |
|
|
|
updateOrder.setId(record.getId()); |
|
|
|
updateOrder.setOrderId(record.getOrderId()); |
|
|
|
updateOrder.setcUserId(userQ.getId()); |
|
|
|
updateOrder.setUpdateTime(currentDate); |
|
|
|
updateOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); |
|
|
|
updateOrder.setTransactionId(transactionId); |
|
|
|
updateOrder.setFailReason(""); |
|
|
|
try { |
|
|
|
wxPayOrderMapper.updateByPrimaryKeySelective(updateOrder); |
|
|
|
} catch (Exception e) { |
|
|
|
@@ -1223,7 +1232,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
|
} |
|
|
|
|
|
|
|
// 修改订单状态 |
|
|
|
order.setCUserId(user1.getId()); |
|
|
|
order.setCUserId(userQ.getId()); |
|
|
|
try { |
|
|
|
int _count = wxOrderService.microPayOrderSuccess(order); |
|
|
|
if (_count > 1) { |
|
|
|
@@ -1234,6 +1243,8 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { |
|
|
|
throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "订单更新"); |
|
|
|
} |
|
|
|
|
|
|
|
// TODO 支付发券 |
|
|
|
|
|
|
|
/* |
|
|
|
Map<String, String> msgMap = new HashMap<>(); |
|
|
|
try { |
|
|
|
|