|
@@ -175,6 +175,12 @@ public class WxPayController {
|
|
|
throw new Exception("支付已完成,但未找到此订单号的流水");
|
|
|
}
|
|
|
|
|
|
+ mergeOrderInfo.setPayStatus(20);
|
|
|
+ mergeOrderInfo.setPayName("wechat");
|
|
|
+ mergeOrderInfo.setTransactionId(params.get("trade_no"));
|
|
|
+ mergeOrderInfo.setUpdateTime(new Date());
|
|
|
+ mergeOrderInfoService.update(mergeOrderInfo);
|
|
|
+
|
|
|
List<OrderInfo> orderInfoList = orderInfoService.findByMergeOrderId(mergeOrderInfo.getId());
|
|
|
|
|
|
if (orderInfoList.size()>0){
|