| @@ -45,6 +45,7 @@ public class WxPayOrderController extends BaseController { | |||||
| public ResultData list(@ModelAttribute WxPayOrder wxPayOrder, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxPayOrder wxPayOrder, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] WxPayOrderController::list"); | logger.debug("[" + getIpAddr() + "] WxPayOrderController::list"); | ||||
| if (null == wxPayOrder) wxPayOrder = new WxPayOrder(); | if (null == wxPayOrder) wxPayOrder = new WxPayOrder(); | ||||
| wxPayOrder.updateTenantInfo(getTenantInfo()); | |||||
| final PageInfo<WxPayOrder> page = wxPayOrderService.listAsPage(wxPayOrder, pageNum, pageSize); | final PageInfo<WxPayOrder> page = wxPayOrderService.listAsPage(wxPayOrder, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -492,6 +492,7 @@ public class WxMicroPayController extends BaseController { | |||||
| WxPayOrder qpo = new WxPayOrder(); | WxPayOrder qpo = new WxPayOrder(); | ||||
| qpo.setOrderId(microOrder.getId()); | qpo.setOrderId(microOrder.getId()); | ||||
| qpo.updateTenantInfo(getTenantInfo()); | |||||
| WxPayOrder po = wxPayOrderService.getByObj(qpo); | WxPayOrder po = wxPayOrderService.getByObj(qpo); | ||||
| if (null == po) { | if (null == po) { | ||||
| return new ResultData(ErrorCode.PAY_ORDER_NOT_FOUND); | return new ResultData(ErrorCode.PAY_ORDER_NOT_FOUND); | ||||
| @@ -275,6 +275,7 @@ public class WxPayOrderController extends BaseController { | |||||
| if (null == wxPayOrder) { | if (null == wxPayOrder) { | ||||
| wxPayOrder = new WxPayOrder(); | wxPayOrder = new WxPayOrder(); | ||||
| } | } | ||||
| wxPayOrder.updateTenantInfo(getTenantInfo()); | |||||
| final PageInfo<WxPayOrder> page = wxPayOrderService.listAsPage(wxPayOrder, pageNum, pageSize); | final PageInfo<WxPayOrder> page = wxPayOrderService.listAsPage(wxPayOrder, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -328,6 +328,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| //一个订单只有一条支付记录。 | //一个订单只有一条支付记录。 | ||||
| WxPayOrder orderq = new WxPayOrder(); | WxPayOrder orderq = new WxPayOrder(); | ||||
| orderq.setOrderId(composeOrder.getMainOrderId()); | orderq.setOrderId(composeOrder.getMainOrderId()); | ||||
| orderq.updateTenantInfo(composeOrder); | |||||
| List<WxPayOrder> list = wxPayOrderMapper.findList(orderq); | List<WxPayOrder> list = wxPayOrderMapper.findList(orderq); | ||||
| WxPayOrder oldRecord = null; | WxPayOrder oldRecord = null; | ||||
| if (null != list && list.size() > 0) { | if (null != list && list.size() > 0) { | ||||
| @@ -473,6 +474,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { | |||||
| // 2. check 是否有支付订单 | // 2. check 是否有支付订单 | ||||
| Date currentDate = new Date(); | Date currentDate = new Date(); | ||||
| WxPayOrder pq = new WxPayOrder(); | WxPayOrder pq = new WxPayOrder(); | ||||
| pq.updateTenantInfo(order); | |||||
| pq.setOrderId(EnumComposeOrder.getPayOrderId(order)); | pq.setOrderId(EnumComposeOrder.getPayOrderId(order)); | ||||
| List<WxPayOrder> list = wxPayOrderMapper.findList(pq); | List<WxPayOrder> list = wxPayOrderMapper.findList(pq); | ||||
| String payOrderNo = ""; | String payOrderNo = ""; | ||||