md
This commit is contained in:
parent
66f370d575
commit
b70cdcccef
@ -50,6 +50,7 @@ import java.io.InputStream;
|
|||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
import java.net.URLEncoder;
|
import java.net.URLEncoder;
|
||||||
import java.nio.charset.StandardCharsets;
|
import java.nio.charset.StandardCharsets;
|
||||||
|
import java.time.LocalDate;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -99,6 +100,21 @@ public class SettleBillController extends BaseController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 如果查询已支付的账单,则只查询3个月内的账单
|
||||||
|
if("1".equals(emisSettleBill.getPaymentStatus())){
|
||||||
|
// 起始时间
|
||||||
|
Calendar startCalendar = Calendar.getInstance();
|
||||||
|
startCalendar.add(Calendar.MONTH, -3);
|
||||||
|
Date startDate = startCalendar.getTime();
|
||||||
|
emisSettleBill.getParams().put("beginCreateTime",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,startDate));
|
||||||
|
|
||||||
|
// 结束时间
|
||||||
|
Calendar calendarEnd = Calendar.getInstance();
|
||||||
|
calendarEnd.set(Calendar.DAY_OF_MONTH, calendarEnd.getActualMaximum(Calendar.DAY_OF_MONTH));
|
||||||
|
Date endDate = calendarEnd.getTime();
|
||||||
|
emisSettleBill.getParams().put("endCreateTime",DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD,endDate)+" 23:59:59");
|
||||||
|
}
|
||||||
|
|
||||||
List<EmisSettleBill> list = emisSettleBillService.selectEmisSettleBillList(emisSettleBill);
|
List<EmisSettleBill> list = emisSettleBillService.selectEmisSettleBillList(emisSettleBill);
|
||||||
return getDataTable(list);
|
return getDataTable(list);
|
||||||
}
|
}
|
||||||
@ -113,6 +129,38 @@ public class SettleBillController extends BaseController
|
|||||||
return AjaxResult.success(emisSettleBillService.selectEmisSettleBillById(id));
|
return AjaxResult.success(emisSettleBillService.selectEmisSettleBillById(id));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取结算总账单详细信息
|
||||||
|
*/
|
||||||
|
@GetMapping(value = "/getSimpleInfoBySettleBillNo")
|
||||||
|
public AjaxResult getSimpleInfoBySettleBillNo(String settleBillNo)
|
||||||
|
{
|
||||||
|
EmisSettleBill emisSettleBill=emisBaseService.getSettleBillBySettleBillNo(settleBillNo);
|
||||||
|
|
||||||
|
BigDecimal thisPayMoney=emisSettleBill.getRecMoney().subtract(emisSettleBill.getRecedMoney());
|
||||||
|
emisSettleBill.setThisPayMoney(thisPayMoney);
|
||||||
|
|
||||||
|
// subBillList , 返回子账单列表
|
||||||
|
// List<EmisSettleSubBill> subBillList=emisBaseService.selectSubBillListBySettleBillNo(settleBillNo);
|
||||||
|
// emisSettleBill.setSubBillList(subBillList);
|
||||||
|
|
||||||
|
try {
|
||||||
|
int isCanPay=emisSettleBillService.checkCanOnlinePay(emisSettleBill);
|
||||||
|
if(isCanPay==1) {
|
||||||
|
emisSettleBill.setBlLockOnlinePay("F");
|
||||||
|
}else{
|
||||||
|
emisSettleBill.setBlLockOnlinePay("T");
|
||||||
|
emisSettleBill.setLockOnlinePayReason("该单不支持在线支付");
|
||||||
|
}
|
||||||
|
} catch (EmisBizError emisBizError) {
|
||||||
|
emisBizError.printStackTrace();
|
||||||
|
emisSettleBill.setBlLockOnlinePay("T");
|
||||||
|
emisSettleBill.setLockOnlinePayReason("该单不支持在线支付:"+emisBizError.getMessage());
|
||||||
|
}
|
||||||
|
|
||||||
|
return AjaxResult.success("成功",emisSettleBill);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取结算总账单详细信息
|
* 获取结算总账单详细信息
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user