|
|
|
@@ -123,10 +123,10 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); |
|
|
|
} |
|
|
|
return new ResultData(getVoPage(wxMerchant, pageNum, pageSize,null)); |
|
|
|
return new ResultData(getVoPage(wxMerchant, pageNum, pageSize)); |
|
|
|
} |
|
|
|
|
|
|
|
private PageInfo<WxMerchantBillVo> getVoPage(WxMerchant wxMerchant,Integer pageNum, Integer pageSize , Integer billStaus) { |
|
|
|
private PageInfo<WxMerchantBillVo> getVoPage(WxMerchant wxMerchant,Integer pageNum, Integer pageSize) { |
|
|
|
Date starttime = wxMerchant.getStarttime(); |
|
|
|
Date enttime = wxMerchant.getEndtime(); |
|
|
|
wxMerchant.setStarttime(null); |
|
|
|
@@ -155,7 +155,6 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
vo.setShopNumber(billAllHelper.getMerchantShopNumber(m)); |
|
|
|
|
|
|
|
wxMerchant.setId(m.getId()); |
|
|
|
//wxMerchant.setBillStatus(billStaus); |
|
|
|
WxBillSum rentSum = billAllHelper.getBillSum(wxMerchant,starttime, enttime); |
|
|
|
vo.setNeedPay(rentSum.getNeedPay()); |
|
|
|
vo.setPaid(rentSum.getPaid()); |
|
|
|
@@ -192,7 +191,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); |
|
|
|
} |
|
|
|
PageInfo<WxMerchantBillVo> page = getVoPage(wxMerchant, 1, 10000,null); |
|
|
|
PageInfo<WxMerchantBillVo> page = getVoPage(wxMerchant, 1, 10000); |
|
|
|
excelService.exportExcel(page.getList(), null, "商户账单总览数据", WxMerchantBillVo.class, "商户账单总览数据.xlsx", response, false); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -591,67 +590,36 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
//return wxBillAllService.updateReceivePay(wxBillAll, getUser(),false); |
|
|
|
} |
|
|
|
|
|
|
|
//坏账统计 |
|
|
|
@GetMapping("badtj") |
|
|
|
public ResultData badtj(@ModelAttribute WxBillAction wxBillAction) { |
|
|
|
wxBillAction.updateTenantInfo(getTenantInfo()); |
|
|
|
List<WxBillBad> jList = wxBillActionService.findBad(wxBillAction); |
|
|
|
Map<Integer,String> map = new HashMap<Integer,String>(); |
|
|
|
if (null != jList && jList.size() > 0 ) { |
|
|
|
for (int i = 0 ; i < jList.size() ; i++) { |
|
|
|
WxBillBad jm = jList.get(i); |
|
|
|
map.put(jm.getBillType(), jm.getTotal()); |
|
|
|
} |
|
|
|
} |
|
|
|
Map retMap = new HashMap(); |
|
|
|
BigDecimal total = new BigDecimal("0.00"); |
|
|
|
List<WxBillBad> retList = new ArrayList<WxBillBad>(); |
|
|
|
for (EnumBillAllType at : EnumBillAllType.values()) { |
|
|
|
String money = map.get(at.getCode()); |
|
|
|
if (StringUtils.isBlank(money)) { |
|
|
|
money = "0.00"; |
|
|
|
} |
|
|
|
WxBillBad bjm = new WxBillBad(); |
|
|
|
bjm.setBillType(at.getCode()); |
|
|
|
bjm.setTotal(money); |
|
|
|
retList.add(bjm); |
|
|
|
total = total.add(new BigDecimal(money)); |
|
|
|
} |
|
|
|
|
|
|
|
retMap.put("total", total.toPlainString()); |
|
|
|
retMap.put("list", retList); |
|
|
|
return new ResultData(retMap); |
|
|
|
} |
|
|
|
|
|
|
|
//退租列表 |
|
|
|
@GetMapping("tuizujs") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
|
public ResultData tuizujs(@ModelAttribute WxMerchant wxMerchant, Integer pageNum, Integer pageSize) { |
|
|
|
wxMerchant.updateTenantInfo(getTenantInfo()); |
|
|
|
WxUserDataRule dataRule = this.getCurrentDataFloors(); |
|
|
|
if (null != dataRule) { |
|
|
|
wxMerchant.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
wxMerchant.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
wxMerchant.setShopTypeForRule(dataRule.getShopTypes()); |
|
|
|
} |
|
|
|
return new ResultData(getVoPage(wxMerchant, pageNum, pageSize,EnumBillStatus.STOP_TO_SETTLE.getCode())); |
|
|
|
} |
|
|
|
|
|
|
|
//商户待结算账单 |
|
|
|
@GetMapping("settleList") |
|
|
|
public ResultData settleList(@ModelAttribute WxMerchant wxMerchant,Integer billType) { |
|
|
|
//wxMerchant.setBillStatus(EnumBillStatus.STOP_TO_SETTLE.getCode()); |
|
|
|
return new ResultData(getBillList(wxMerchant, false,getNearBillBeforeDays(), 1, 100)); |
|
|
|
} |
|
|
|
|
|
|
|
// //商户待结算账单 |
|
|
|
// @PostMapping("billCompleted") |
|
|
|
// public ResultData billCompleted(@ModelAttribute WxMerchant wxMerchant) { |
|
|
|
// wxMerchant.setBillCompleteRemark("商户退租结算完成"); |
|
|
|
// billAllHelper.completeBill(EnumBillStatus.STOP_TO_SETTLE, wxMerchant, getUser()); |
|
|
|
// return new ResultData(); |
|
|
|
// //坏账统计 |
|
|
|
// @GetMapping("badtj") |
|
|
|
// public ResultData badtj(@ModelAttribute WxBillAction wxBillAction) { |
|
|
|
// wxBillAction.updateTenantInfo(getTenantInfo()); |
|
|
|
// List<WxBillBad> jList = wxBillActionService.findBad(wxBillAction); |
|
|
|
// Map<Integer,String> map = new HashMap<Integer,String>(); |
|
|
|
// if (null != jList && jList.size() > 0 ) { |
|
|
|
// for (int i = 0 ; i < jList.size() ; i++) { |
|
|
|
// WxBillBad jm = jList.get(i); |
|
|
|
// map.put(jm.getBillType(), jm.getTotal()); |
|
|
|
// } |
|
|
|
// } |
|
|
|
// Map retMap = new HashMap(); |
|
|
|
// BigDecimal total = new BigDecimal("0.00"); |
|
|
|
// List<WxBillBad> retList = new ArrayList<WxBillBad>(); |
|
|
|
// for (EnumBillAllType at : EnumBillAllType.values()) { |
|
|
|
// String money = map.get(at.getCode()); |
|
|
|
// if (StringUtils.isBlank(money)) { |
|
|
|
// money = "0.00"; |
|
|
|
// } |
|
|
|
// WxBillBad bjm = new WxBillBad(); |
|
|
|
// bjm.setBillType(at.getCode()); |
|
|
|
// bjm.setTotal(money); |
|
|
|
// retList.add(bjm); |
|
|
|
// total = total.add(new BigDecimal(money)); |
|
|
|
// } |
|
|
|
// |
|
|
|
// retMap.put("total", total.toPlainString()); |
|
|
|
// retMap.put("list", retList); |
|
|
|
// return new ResultData(retMap); |
|
|
|
// } |
|
|
|
|
|
|
|
//商户可以缴费账单,临期账单以内都可以缴费 |
|
|
|
|