| @@ -470,7 +470,7 @@ public class WxCarController extends BaseController { | |||||
| return new ResultData(Result.ERROR,"未设置停车商户."); | return new ResultData(Result.ERROR,"未设置停车商户."); | ||||
| } | } | ||||
| WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(park, parkMerchant.getId(), EnumAppPlat.WX, EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT_v2); | |||||
| WxProfitSharingReceiver receiver = wxProfitSharingReceiverService.findReceiver(park, parkMerchant.getId(), EnumAppPlat.WX, EnumProfitSharingType.PROFIT_SHARING_TYPE_WECHAT); | |||||
| if (null == receiver || StringUtils.isBlank(receiver.getReceiverAccount())) { | if (null == receiver || StringUtils.isBlank(receiver.getReceiverAccount())) { | ||||
| //查询商官商户 | //查询商官商户 | ||||
| WxMerchant adminMerchant = wxMerchantService.findAdmin(park); | WxMerchant adminMerchant = wxMerchantService.findAdmin(park); | ||||
| @@ -526,6 +526,7 @@ public class WxCarController extends BaseController { | |||||
| public ResultData payOrderList(Integer pageNum, Integer pageSize) { | public ResultData payOrderList(Integer pageNum, Integer pageSize) { | ||||
| WxCarPayOrder carPayOrder = new WxCarPayOrder(); | WxCarPayOrder carPayOrder = new WxCarPayOrder(); | ||||
| carPayOrder.updateTenantInfo(getTenantInfo()); | carPayOrder.updateTenantInfo(getTenantInfo()); | ||||
| carPayOrder.setCUserId(getMemberId()); | |||||
| carPayOrder.setSortColumn(SortField.CreateTime_DESC.getValue()); | carPayOrder.setSortColumn(SortField.CreateTime_DESC.getValue()); | ||||
| return new ResultData(wxParkPayService.listPayOrderAsPage(carPayOrder, pageNum, pageSize)); | return new ResultData(wxParkPayService.listPayOrderAsPage(carPayOrder, pageNum, pageSize)); | ||||
| } | } | ||||