diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java index f157a569e..71f328d4c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -9,6 +9,7 @@ import com.iformall.domain.dto.FinanceSetOffDTO; import com.iformall.domain.po.WxBillPayWay; import com.iformall.domain.po.WxEnergyFees; 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.WxBillBaseEntity; 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) { record.updateTenantInfo(getTenantInfo()); record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); - PageInfo page = wxFinanceService.receiveListAsPage(record, pageNum, pageSize); + PageInfo page = wxFinanceService.receiveVoListAsPage(record, pageNum, pageSize); return new ResultData(page); } @@ -300,7 +301,7 @@ public class WxFinanceController extends BaseController { public ResultData receiveSetoffList(@ModelAttribute WxFinanceReceive record, Integer pageNum, Integer pageSize) { record.updateTenantInfo(getTenantInfo()); record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); - PageInfo page = wxFinanceService.receiveListAsPage(record, pageNum, pageSize); + PageInfo page = wxFinanceService.receiveSetoffListAsPage(record, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java index 51dfbbedf..a449dfec8 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java @@ -139,5 +139,7 @@ public class WxFinanceReceive extends TenantEntity { private Long floor; @TableField(exist = false) private String shopIds; + @TableField(exist = false) + private Integer finishStatus; } diff --git a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java index d1c98ad95..98ff99b28 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxFinanceService.java @@ -26,7 +26,7 @@ public interface WxFinanceService { void payWayInit(TenantEntity tenantInfo); //收款 - PageInfo receiveListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize); + PageInfo receiveVoListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize); List createReceive(WxFinanceReceive record,MallUserInfo user); WxFinanceReceive getReceiveById(TenantEntity tenantEntity,Long id); void invalidReceive(WxFinanceReceive record,MallUserInfo user,String remark); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java index d9e1bf09b..775e9a8ab 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -399,7 +399,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { } @Override - public PageInfo receiveListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize) { + public PageInfo receiveVoListAsPage(WxFinanceReceive record, Integer pageIndex, Integer pageSize) { initQueryParam(record); PageInfo page = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxFinanceReceiveMapper.findList(record)); PageInfo pageVo = new PageInfo(); diff --git a/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml b/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml index 759c13d68..7415a9aad 100644 --- a/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml @@ -44,6 +44,7 @@ and `create_time` <= #{createTimeEnd} and `fees_id` = #{feesId} and `is_print` = #{isPrint} + and `status` in (1,4) and merchant_id in