Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
a9a30a8e9d
4 changed files with 27 additions and 2 deletions
  1. +15
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java
  2. +5
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java
  4. +6
    -0
      mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml

+ 15
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java View File

@@ -474,6 +474,21 @@ public class WxFinanceController extends BaseController {
} }
record.updateTenantInfo(getTenantInfo()); record.updateTenantInfo(getTenantInfo());
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); record.setSortColumns(BaseEntity.SortField.CreateTime_DESC);
if (StringUtils.isNotBlank(record.getQueryShopIdsStr())){
String[] shids = record.getQueryShopIdsStr().split(",");
if (null != shids && shids.length > 0 ) {
List<Long> shopIds = new ArrayList<Long>();
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<WxFinanceReceiveVo> page = wxFinanceService.receiveVoListWithBillsAsPage(record, pageNum, pageSize); PageInfo<WxFinanceReceiveVo> page = wxFinanceService.receiveVoListWithBillsAsPage(record, pageNum, pageSize);
return new ResultData(page); return new ResultData(page);
} }


+ 5
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxFinanceReceive.java View File

@@ -170,7 +170,7 @@ public class WxFinanceReceive extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "客户名称(多个逗号分隔)", name = "billCusName") @io.swagger.annotations.ApiModelProperty(value = "客户名称(多个逗号分隔)", name = "billCusName")
private String billCusName; private String billCusName;
@io.swagger.annotations.ApiModelProperty(value = "铺位号(多个逗号分隔,便于查询)", name = "billCusName")
@io.swagger.annotations.ApiModelProperty(value = "店铺ID(多个逗号分隔,便于查询)", name = "billCusName")
private String billShopNumber; private String billShopNumber;
@TableField(exist = false) @TableField(exist = false)
@@ -192,5 +192,9 @@ public class WxFinanceReceive extends TenantEntity {
private String rentName; private String rentName;
@TableField(exist = false) @TableField(exist = false)
private List<Long> notInIds; private List<Long> notInIds;
@TableField(exist = false)
private String queryShopIdsStr;
@TableField(exist = false)
private List<Long> queryShopIdList;


} }

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java View File

@@ -694,7 +694,7 @@ public class WxFinanceServiceImpl implements WxFinanceService {
} }
if (!shopIdList.contains(be.getShopId())) { if (!shopIdList.contains(be.getShopId())) {
shopIdList.add(be.getShopId()); shopIdList.add(be.getShopId());
shopnumberSb.append(be.getShopNumber()).append(",");
shopnumberSb.append(be.getShopId()).append(",");
billCusSb.append(be.getCusName()).append(","); billCusSb.append(be.getCusName()).append(",");
} }
} }


+ 6
- 0
mallinkService/src/main/resources/mapper/WxFinanceReceiveMapper.xml View File

@@ -64,6 +64,12 @@
#{sItem} #{sItem}
</foreach> </foreach>
</if> </if>
<if test=" null != queryShopIdList ">
and
<foreach collection="queryShopIdList" index="index" item="qshItem" open="(" separator="or" close=")">
`bill_shop_number` like concat('%',#{qshItem},'%')
</foreach>
</if>
<if test=" null != feesIdList "> <if test=" null != feesIdList ">
and fees_id in and fees_id in


Loading…
Cancel
Save