diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java index 5d9bcaba9..7e0fca77b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBillSettle.java @@ -87,4 +87,9 @@ public class WxBillSettle extends BaseEntity { @Transient @io.swagger.annotations.ApiModelProperty(value="清算方向 1商场结款 2商户结款",name="settleWay") private Integer settleWay; + + @Transient + @io.swagger.annotations.ApiModelProperty(value="流向 0流入 1流出",name="direction") + private Integer direction; + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java index 132a1a4c2..9216cc8f8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -60,11 +60,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { @Override public PageInfo listAsPage(WxBillSettle record, Integer pageIndex, Integer pageSize) { - PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillSettleMapper.findList(record)); - pageInfo.getList().stream().forEach(e->{ - e.setBalance(e.getReceiveMoney() - e.getPayMoney()); - }); - return pageInfo; + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxBillSettleMapper.findList(record)); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml b/mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml index eb2c6554f..6bb84d8a2 100644 --- a/mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillSettleMapper.xml @@ -24,23 +24,32 @@ where 1=1 - and s.`id` = #{id} - and s.`tenant_id` = #{tenantId} - and m.name like concat('%', #{merchantName},'%') + and tt.`id` = #{id} + and tt.`tenant_id` = #{tenantId} + and tt.merchantName like concat('%', #{merchantName},'%') - and createtime >= #{startTime} + and tt.createtime >= #{startTime} - and createtime <= #{endTime} + and tt.createtime <= #{endTime} + + and tt.`settle_number` = #{settleNumber} + and tt.`status` = #{status} + and tt.`apply_status` = #{applyStatus} + + + balance >0 + + + balance <0 + - and s.`settle_number` = #{settleNumber} - and s.`status` = #{status} - and s.`apply_status` = #{applyStatus} order by ${sortColumns}