diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java index 7e1329db8..0373d6bfc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java @@ -45,6 +45,7 @@ public class WxPayOrderController extends BaseController { public ResultData list(@ModelAttribute WxPayOrder wxPayOrder, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxPayOrderController::list"); if (null == wxPayOrder) wxPayOrder = new WxPayOrder(); + wxPayOrder.updateTenantInfo(getTenantInfo()); final PageInfo page = wxPayOrderService.listAsPage(wxPayOrder, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java index b693979ac..5131272a6 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java @@ -492,6 +492,7 @@ public class WxMicroPayController extends BaseController { WxPayOrder qpo = new WxPayOrder(); qpo.setOrderId(microOrder.getId()); + qpo.updateTenantInfo(getTenantInfo()); WxPayOrder po = wxPayOrderService.getByObj(qpo); if (null == po) { return new ResultData(ErrorCode.PAY_ORDER_NOT_FOUND); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java index 18a2294c2..2bb1c9d07 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -275,6 +275,7 @@ public class WxPayOrderController extends BaseController { if (null == wxPayOrder) { wxPayOrder = new WxPayOrder(); } + wxPayOrder.updateTenantInfo(getTenantInfo()); final PageInfo page = wxPayOrderService.listAsPage(wxPayOrder, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index a6d856c45..71b9b74f5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -328,6 +328,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { //一个订单只有一条支付记录。 WxPayOrder orderq = new WxPayOrder(); orderq.setOrderId(composeOrder.getMainOrderId()); + orderq.updateTenantInfo(composeOrder); List list = wxPayOrderMapper.findList(orderq); WxPayOrder oldRecord = null; if (null != list && list.size() > 0) { @@ -473,6 +474,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { // 2. check 是否有支付订单 Date currentDate = new Date(); WxPayOrder pq = new WxPayOrder(); + pq.updateTenantInfo(order); pq.setOrderId(EnumComposeOrder.getPayOrderId(order)); List list = wxPayOrderMapper.findList(pq); String payOrderNo = "";