diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java index 31cc41fd3..b65dc7bc2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java @@ -180,12 +180,5 @@ public class WxCouponController extends BaseController { return new ResultData(wxCouponService.findPressData(wxCoupon,pageNum,pageSize)); } - @ApiOperation("商户活动列表信息") - @GetMapping("findByMerchant") - @SystemControllerLog(description = "商户活动列表信息") - public ResultData findByMerchant(@ModelAttribute WxCoupon wxCoupon) { - return new ResultData(wxCouponService.findByMerchant(wxCoupon)); - } - } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java index 14d875380..a1495edd1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/rent/WxBillAllController.java @@ -97,6 +97,28 @@ public class WxBillAllController extends BaseController { return new ResultData(result); } + /** + * 代缴商户列表 + * @param wxBillAll + * @param pageNum + * @param pageSize + * @return + */ + @GetMapping("waitMerchantlist") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) + @SystemControllerLog(description = "费用收缴数据-代缴商户列表") + public ResultData waitMerchantlist(@ModelAttribute WxBillAll wxBillAll, Integer pageNum, Integer pageSize) { + logger.debug("[" + getIpAddr() + "] WxBillAllController::waitMerchantlist"); + if (null == wxBillAll) { + wxBillAll = new WxBillAll(); + } + wxBillAll.setTenantId(getTenantId()); + Map result = wxBillAllService.getWaitBillAsPage(wxBillAll, pageNum, pageSize); + return new ResultData(result); + } + @ApiOperation("导出欠缴商户列表") @GetMapping("/exportOweMerchantlist") diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java index a194049f6..7dad77ab5 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCouponController.java @@ -80,4 +80,10 @@ public class WxCouponController extends BaseController { return wxCouponService.list(wxCoupon, pageNum, pageSize); //全列表 } + @ApiOperation("商户活动列表信息") + @GetMapping("findByMerchant") + public ResultData findByMerchant(@ModelAttribute WxCoupon wxCoupon) { + return new ResultData(wxCouponService.findByMerchant(wxCoupon)); + } + } diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java index 66fdede14..0aef0359f 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxBillAllMapper.java @@ -42,4 +42,9 @@ public interface WxBillAllMapper { */ List> getOweBillAsPage(WxBillAll record); + /** + * 代缴商户分页列表 + * @return + */ + List> getWaitBillAsPage(WxBillAll record); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java index ad8e72a23..73597752b 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBillAllService.java @@ -43,6 +43,12 @@ public interface WxBillAllService { */ Map getOweBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize); + /** + * 代缴商户分页列表 + * @return + */ + Map getWaitBillAsPage(WxBillAll record,Integer pageNum, Integer pageSize); + void exportOweMerchant(WxBillAll record, HttpServletRequest request, HttpServletResponse response); void updateBillStatus(WxBillAll record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java index 16f1906f6..25a386bec 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java @@ -755,6 +755,23 @@ public class WxBillAllServiceImpl implements WxBillAllService { return result; } + @Override + public Map getWaitBillAsPage(WxBillAll record, Integer pageNum, Integer pageSize) { + PageInfo> pageInfo = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxBillAllMapper.getWaitBillAsPage(record)); + List> list = pageInfo.getList(); + for (Map map:list) { + map.put("rentOwe",subZeroAndDot(map.get("rentOwe").toString())); + map.put("propertyOwe",subZeroAndDot(map.get("propertyOwe").toString())); + map.put("depositOwe",subZeroAndDot(map.get("depositOwe").toString())); + map.put("otherOwe",subZeroAndDot(map.get("otherOwe").toString())); + map.put("totalOwe",subZeroAndDot(map.get("totalOwe").toString())); + } + pageInfo.setList(list); + Map result = new HashMap<>(); + result.put("pageInfo", pageInfo); + return result; + } + /** * 使用java正则表达式去掉多余的.与0 * @param s diff --git a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml index 455496c6b..0eda35dfe 100644 --- a/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxBillAllMapper.xml @@ -627,5 +627,4 @@ order by totalOwe desc -