winter 1 год назад
Родитель
Сommit
f0a3ec3085
3 измененных файлов: 43 добавлений и 75 удалений
  1. +33
    -65
      mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java
  2. +6
    -6
      mallinkService/src/main/java/com/iformall/enums/EnumBillStatus.java
  3. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java

+ 33
- 65
mallinkAdmin/src/main/java/com/iformall/controller/rent/WxAllBillController.java Просмотреть файл

@@ -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);
// }
//商户可以缴费账单,临期账单以内都可以缴费


+ 6
- 6
mallinkService/src/main/java/com/iformall/enums/EnumBillStatus.java Просмотреть файл

@@ -9,12 +9,12 @@ public enum EnumBillStatus {
//NOT_PAID(1, "欠缴"),
//NOT_EXPIRED(4,"未到期"),
//RETURN(5, "已退还"),
WAIT_PAY(2,"待缴"),
PAID(3, "已结清"),
INVALID(6, "失效"),
BAD(7, "坏账"),
STOP_TO_SETTLE(8,"待结算"),
SET_OFF(9,"预收待抵扣")
// WAIT_PAY(2,"待缴"),
// PAID(3, "已结清"),
// INVALID(6, "失效"),
// BAD(7, "坏账"),
// STOP_TO_SETTLE(8,"待结算"),
// SET_OFF(9,"预收待抵扣")
;

public static EnumBillStatus getEnum(Integer code) {


+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxFinanceServiceImpl.java Просмотреть файл

@@ -947,15 +947,15 @@ public class WxFinanceServiceImpl implements WxFinanceService {
WxEnergyFees fees = wxEnergyService.getFeesById(fq) ;
WxMerchant merchant = wxMerchantService.selectById(record.getMerchantId());
if (fees.getBillType().intValue() == EnumBillAllType.ADVANCE.getCode().intValue()) {
generateTempBill(record, merchant, user,EnumBillAllType.ADVANCE,EnumBillStatus.SET_OFF);
generateTempBill(record, merchant, user,EnumBillAllType.ADVANCE);
}else if (fees.getBillType().intValue() == EnumBillAllType.OTHER_DEPOSIT.getCode().intValue()) {
generateTempBill(record, merchant, user,EnumBillAllType.OTHER_DEPOSIT,EnumBillStatus.WAIT_PAY);
generateTempBill(record, merchant, user,EnumBillAllType.OTHER_DEPOSIT);
}else if (fees.getBillType().intValue() == EnumBillAllType.OTHER.getCode().intValue()) {
generateTempBill(record, merchant, user,EnumBillAllType.OTHER,EnumBillStatus.WAIT_PAY);
generateTempBill(record, merchant, user,EnumBillAllType.OTHER);
}
}
public void generateTempBill(WxAllBill record,WxMerchant merchant,MallUserInfo user, EnumBillAllType billType,EnumBillStatus billStatus ) {
public void generateTempBill(WxAllBill record,WxMerchant merchant,MallUserInfo user, EnumBillAllType billType) {
WxAllBill advanceBill = new WxAllBill();
advanceBill.updateTenantInfo(record);
advanceBill.setMerchantId(merchant.getId());


Загрузка…
Отмена
Сохранить