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 9c06afca7..56d0ddbe6 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java @@ -474,6 +474,21 @@ public class WxFinanceController extends BaseController { } record.updateTenantInfo(getTenantInfo()); record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); + if (StringUtils.isNotBlank(record.getQueryShopIdsStr())){ + String[] shids = record.getQueryShopIdsStr().split(","); + if (null != shids && shids.length > 0 ) { + List shopIds = new ArrayList(); + for (int i = 0 ; i < shids.length ; i ++) { + String s = shids[i]; + if (StringUtils.isNoneBlank(s)) { + shopIds.add(Long.parseLong(s)); + } + } + if (shopIds.size() > 0 ) { + record.setQueryShopIdList(shopIds);; + } + } + } PageInfo page = wxFinanceService.receiveVoListWithBillsAsPage(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 727d9149a..4026e7d8a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java @@ -170,7 +170,7 @@ public class WxFinanceReceive extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value = "客户名称(多个逗号分隔)", name = "billCusName") private String billCusName; - @io.swagger.annotations.ApiModelProperty(value = "铺位号(多个逗号分隔,便于查询)", name = "billCusName") + @io.swagger.annotations.ApiModelProperty(value = "店铺ID(多个逗号分隔,便于查询)", name = "billCusName") private String billShopNumber; @TableField(exist = false) @@ -192,5 +192,9 @@ public class WxFinanceReceive extends TenantEntity { private String rentName; @TableField(exist = false) private List notInIds; + @TableField(exist = false) + private String queryShopIdsStr; + @TableField(exist = false) + private List queryShopIdList; } 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 fcf707b8f..0338bcc69 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java @@ -694,7 +694,7 @@ public class WxFinanceServiceImpl implements WxFinanceService { } if (!shopIdList.contains(be.getShopId())) { shopIdList.add(be.getShopId()); - shopnumberSb.append(be.getShopNumber()).append(","); + shopnumberSb.append(be.getShopId()).append(","); billCusSb.append(be.getCusName()).append(","); } } diff --git a/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml b/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml index 09b14c6b2..431795457 100644 --- a/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml @@ -64,6 +64,12 @@ #{sItem} + + and + + `bill_shop_number` like concat('%',#{qshItem},'%') + + and fees_id in