|
@@ -116,7 +116,7 @@ public class PayCallBackController {
|
|
|
|
|
|
|
|
|
|
|
|
- @RequestMapping(value = "dg/orderCallback")
|
|
|
+ @RequestMapping(value = "/dg/orderCallback")
|
|
|
@ResponseBody
|
|
|
public Map<String, Object> orderCallback(HttpServletResponse response, HttpServletRequest request) {
|
|
|
response.setHeader("Access-Control-Allow-Origin", "*");
|
|
@@ -163,6 +163,20 @@ public class PayCallBackController {
|
|
|
payOrder.setChannelNo(huifuId);
|
|
|
payOrder.setOrderStatus("1");
|
|
|
|
|
|
+ // 更新订单,单个事务处理
|
|
|
+ logger.info("支付回调消息更新成功 shopOrderNo:"+tradesId);
|
|
|
+ walletService.payOrderStatusHandle(payOrder);
|
|
|
+
|
|
|
+ // 订单支付状态单独保存
|
|
|
+ LambdaUpdateWrapper<PayOrder> updateWrapper = new LambdaUpdateWrapper<>();
|
|
|
+ updateWrapper.eq(PayOrder::getOrderStatus, PayOrderStatusEnum.WAIT.getValue());
|
|
|
+ updateWrapper.eq(PayOrder::getOrderId, tradesId);
|
|
|
+ boolean ret = payOrderService.update(payOrder, updateWrapper);
|
|
|
+ if (!ret) {
|
|
|
+ throw new ServiceException("支付订单更新失败,orderId:" + tradesId);
|
|
|
+ }
|
|
|
+ responseWrite(response,"success");
|
|
|
+
|
|
|
Map<String,Object> map = payOrderService.dougongPaySuccessCallBack(payOrder);
|
|
|
return map;
|
|
|
|