| @@ -9,6 +9,7 @@ import com.iformall.domain.dto.FinanceSetOffDTO; | |||||
| import com.iformall.domain.po.WxBillPayWay; | import com.iformall.domain.po.WxBillPayWay; | ||||
| import com.iformall.domain.po.WxEnergyFees; | import com.iformall.domain.po.WxEnergyFees; | ||||
| import com.iformall.domain.po.WxFinanceReceive; | import com.iformall.domain.po.WxFinanceReceive; | ||||
| import com.iformall.domain.po.WxFinanceReceiveSetoff; | |||||
| import com.iformall.domain.po.base.BaseEntity; | import com.iformall.domain.po.base.BaseEntity; | ||||
| import com.iformall.domain.po.base.WxBillBaseEntity; | import com.iformall.domain.po.base.WxBillBaseEntity; | ||||
| import com.iformall.domain.vo.FinanceBillSetoffSum; | import com.iformall.domain.vo.FinanceBillSetoffSum; | ||||
| @@ -259,7 +260,7 @@ public class WxFinanceController extends BaseController { | |||||
| public ResultData receiveList(@ModelAttribute WxFinanceReceive record, Integer pageNum, Integer pageSize) { | public ResultData receiveList(@ModelAttribute WxFinanceReceive record, Integer pageNum, Integer pageSize) { | ||||
| record.updateTenantInfo(getTenantInfo()); | record.updateTenantInfo(getTenantInfo()); | ||||
| record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); | record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); | ||||
| PageInfo<WxFinanceReceiveVo> page = wxFinanceService.receiveListAsPage(record, pageNum, pageSize); | |||||
| PageInfo<WxFinanceReceiveVo> page = wxFinanceService.receiveVoListAsPage(record, pageNum, pageSize); | |||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -300,7 +301,7 @@ public class WxFinanceController extends BaseController { | |||||
| public ResultData receiveSetoffList(@ModelAttribute WxFinanceReceive record, Integer pageNum, Integer pageSize) { | public ResultData receiveSetoffList(@ModelAttribute WxFinanceReceive record, Integer pageNum, Integer pageSize) { | ||||
| record.updateTenantInfo(getTenantInfo()); | record.updateTenantInfo(getTenantInfo()); | ||||
| record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); | record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); | ||||
| PageInfo<WxFinanceReceive> page = wxFinanceService.receiveListAsPage(record, pageNum, pageSize); | |||||
| PageInfo<WxFinanceReceiveSetoff> page = wxFinanceService.receiveSetoffListAsPage(record, pageNum, pageSize); | |||||
| return new ResultData(page); | return new ResultData(page); | ||||
| } | } | ||||
| @@ -139,5 +139,7 @@ public class WxFinanceReceive extends TenantEntity { | |||||
| private Long floor; | private Long floor; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String shopIds; | private String shopIds; | ||||
| @TableField(exist = false) | |||||
| private Integer finishStatus; | |||||
| } | } | ||||
| @@ -26,7 +26,7 @@ public interface WxFinanceService { | |||||
| void payWayInit(TenantEntity tenantInfo); | void payWayInit(TenantEntity tenantInfo); | ||||
| //收款 | //收款 | ||||
| PageInfo<WxFinanceReceiveVo> receiveListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize); | |||||
| PageInfo<WxFinanceReceiveVo> receiveVoListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize); | |||||
| List<WxBillBaseEntity> createReceive(WxFinanceReceive record,MallUserInfo user); | List<WxBillBaseEntity> createReceive(WxFinanceReceive record,MallUserInfo user); | ||||
| WxFinanceReceive getReceiveById(TenantEntity tenantEntity,Long id); | WxFinanceReceive getReceiveById(TenantEntity tenantEntity,Long id); | ||||
| void invalidReceive(WxFinanceReceive record,MallUserInfo user,String remark); | void invalidReceive(WxFinanceReceive record,MallUserInfo user,String remark); | ||||
| @@ -399,7 +399,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public PageInfo<WxFinanceReceiveVo> receiveListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize) { | |||||
| public PageInfo<WxFinanceReceiveVo> receiveVoListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize) { | |||||
| initQueryParam(record); | initQueryParam(record); | ||||
| PageInfo<WxFinanceReceive> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxFinanceReceiveMapper.findList(record)); | PageInfo<WxFinanceReceive> page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxFinanceReceiveMapper.findList(record)); | ||||
| PageInfo<WxFinanceReceiveVo> pageVo = new PageInfo<WxFinanceReceiveVo>(); | PageInfo<WxFinanceReceiveVo> pageVo = new PageInfo<WxFinanceReceiveVo>(); | ||||
| @@ -44,6 +44,7 @@ | |||||
| <if test=" null != createTimeEnd ">and `create_time` <= #{createTimeEnd}</if> | <if test=" null != createTimeEnd ">and `create_time` <= #{createTimeEnd}</if> | ||||
| <if test=" null != feesId ">and `fees_id` = #{feesId}</if> | <if test=" null != feesId ">and `fees_id` = #{feesId}</if> | ||||
| <if test=" null != isPrint ">and `is_print` = #{isPrint}</if> | <if test=" null != isPrint ">and `is_print` = #{isPrint}</if> | ||||
| <if test=" null != finishStatus ">and `status` in (1,4)</if> | |||||
| <if test=" null != merchantIdList "> | <if test=" null != merchantIdList "> | ||||
| and merchant_id in | and merchant_id in | ||||
| <foreach collection="merchantIdList" index="index" item="midItem" open="(" separator="," close=")"> | <foreach collection="merchantIdList" index="index" item="midItem" open="(" separator="," close=")"> | ||||