|
|
@@ -11,10 +11,12 @@ import com.chuanghai.smartschool.tuitionpayment.common.exception.RRException;
|
|
|
import com.chuanghai.smartschool.tuitionpayment.common.utils.CommonResult;
|
|
|
import com.chuanghai.smartschool.tuitionpayment.common.utils.PageParam;
|
|
|
import com.chuanghai.smartschool.tuitionpayment.common.utils.PageUtils;
|
|
|
+import com.chuanghai.smartschool.tuitionpayment.entity.BankItemDetail;
|
|
|
import com.chuanghai.smartschool.tuitionpayment.entity.PayOrderEntity;
|
|
|
import com.chuanghai.smartschool.tuitionpayment.entity.PayableInfoEntity;
|
|
|
import com.chuanghai.smartschool.tuitionpayment.entity.PayableInfoWaterEntity;
|
|
|
import com.chuanghai.smartschool.tuitionpayment.listener.aliexcel.MyStudentNoImportListener;
|
|
|
+import com.chuanghai.smartschool.tuitionpayment.service.BankItemDetailService;
|
|
|
import com.chuanghai.smartschool.tuitionpayment.service.PayOrderService;
|
|
|
import com.chuanghai.smartschool.tuitionpayment.service.PayableInfoService;
|
|
|
import com.chuanghai.smartschool.tuitionpayment.service.PayableInfoWaterService;
|
|
|
@@ -72,8 +74,7 @@ public class PayableInfoController {
|
|
|
@Autowired
|
|
|
private PayItemDetailController payItemDetailController;
|
|
|
@Autowired
|
|
|
- private WechatController wechatController;
|
|
|
-
|
|
|
+ private BankItemDetailService bankItemDetailService;
|
|
|
|
|
|
|
|
|
/**
|
|
|
@@ -152,33 +153,11 @@ public class PayableInfoController {
|
|
|
}
|
|
|
return CommonResult.fail();
|
|
|
}
|
|
|
-//
|
|
|
-// /**
|
|
|
-// * 根据学号和学生姓名获取缴费信息
|
|
|
-// *
|
|
|
-// * @param cardNumber 当前登录用户cardNumber
|
|
|
-// * @param studentNo 学号，新生可用身份证号码代替学号
|
|
|
-// * @param studentName 学生姓名
|
|
|
-// * @return
|
|
|
-// */
|
|
|
-// @GetMapping("payableInfo/{studentNo}/{studentName}")
|
|
|
-// public CommonResult< List<PayableInfoEntity>> getPayableInfoByCardNumberAndName(@RequestHeader("card_number") String cardNumber,
|
|
|
-// @PathVariable("studentNo") String studentNo,
|
|
|
-// @PathVariable("studentName") String studentName) {
|
|
|
-// List<PayableInfoEntity> info = payableInfoService.getPayableInfoByStudentNoAndName(studentNo, studentName);
|
|
|
-// return CommonResult.ok().setResult(info);
|
|
|
-// }
|
|
|
+
|
|
|
|
|
|
/**
|
|
|
- * 学生应缴列表
|
|
|
+ * 缴费列表【管理端】
|
|
|
*
|
|
|
- * @param adminToken // * @param keyword 搜索关键字
|
|
|
- * // * @param payStatus 订单状态
|
|
|
- * // * @param createTime 创建时间
|
|
|
- * // * @param payTime 支付时间
|
|
|
- * // * @param pageParam 分页参数
|
|
|
- * // * @param payItemType 缴费项目支付状态
|
|
|
- * // * @param itemName 缴费项目名
|
|
|
* @return
|
|
|
*/
|
|
|
@AdminLoginCheck
|
|
|
@@ -191,33 +170,24 @@ public class PayableInfoController {
|
|
|
if (queryTO.getItemName().equals("水费缴纳")) {
|
|
|
page = payableInfoWaterService.queryPage(queryTO, pageParam);
|
|
|
totalCount = page.getTotalCount();
|
|
|
-
|
|
|
- List list = page.getList();
|
|
|
- for (int i = 0; i < list.size(); i++) {
|
|
|
- PayableInfoWaterEntity payableInfoWaterEntity = (PayableInfoWaterEntity) list.get(i);
|
|
|
- totalAmount = totalAmount.add(payableInfoWaterEntity.getRealPayAmount());
|
|
|
- }
|
|
|
+ String queryAmount = payableInfoWaterService.queryAmountWater(queryTO);
|
|
|
+ totalAmount = new BigDecimal(queryAmount.split("-")[0]);
|
|
|
|
|
|
} else {
|
|
|
page = payableInfoService.queryPage(queryTO, pageParam);
|
|
|
+ String queryAmount = payableInfoService.queryAmount(queryTO);
|
|
|
+
|
|
|
+ totalAmount = new BigDecimal(queryAmount.split("-")[0]);
|
|
|
totalCount = page.getTotalCount();
|
|
|
- List list = page.getList();
|
|
|
- for (int i = 0; i < list.size(); i++) {
|
|
|
- PayableInfoEntity payableInfoEntity = (PayableInfoEntity) list.get(i);
|
|
|
- totalAmount = totalAmount.add(payableInfoEntity.getRealPayAmount());
|
|
|
- }
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
PayableInfoListVO payableInfoListVO = new PayableInfoListVO();
|
|
|
payableInfoListVO.setPage(page);
|
|
|
payableInfoListVO.setTotalCount(totalCount);
|
|
|
payableInfoListVO.setTotalAmount(totalAmount);
|
|
|
- //如果选择支付状态查询对应状态的金额
|
|
|
- if (StringUtils.hasText(queryTO.getPayStatus())) {
|
|
|
- String amount = payableInfoService.queryAmount(queryTO);
|
|
|
- payableInfoListVO.setTotalCount(Integer.parseInt(amount.split("-")[1]));
|
|
|
- payableInfoListVO.setTotalAmount(new BigDecimal(amount.split("-")[0]).setScale(2, RoundingMode.HALF_UP));
|
|
|
- }
|
|
|
+
|
|
|
return CommonResult.ok().setResult(payableInfoListVO);
|
|
|
}
|
|
|
|
|
|
@@ -232,10 +202,19 @@ public class PayableInfoController {
|
|
|
//@AdminLoginCheck
|
|
|
public void exportTxt(PayOrderQueryTO queryTO,
|
|
|
HttpServletResponse response) throws IOException {
|
|
|
+ List<String> downIDs = new ArrayList<>();
|
|
|
+ String downIds = queryTO.getDownIds();
|
|
|
+ if (downIds != null && !downIds.equals("")) {
|
|
|
+ String[] split = downIds.split("/");
|
|
|
+ for (int m = 0; m < split.length; m++) {
|
|
|
+ downIDs.add(split[m]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if (queryTO.getItemName().equals("水费缴纳")) {
|
|
|
- payableInfoWaterService.exportTxt(response, queryTO);
|
|
|
+ payableInfoWaterService.exportTxt(response, queryTO, downIDs);
|
|
|
} else {
|
|
|
- payableInfoService.exportTxt(response, queryTO);
|
|
|
+ payableInfoService.exportTxt(response, queryTO, downIDs);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -250,10 +229,19 @@ public class PayableInfoController {
|
|
|
public void downloadResult(PayOrderQueryTO queryTO,
|
|
|
HttpServletResponse response) throws IOException {
|
|
|
|
|
|
+ List<String> downIDs = new ArrayList<>();
|
|
|
+ String downIds = queryTO.getDownIds();
|
|
|
+ if (downIds != null && !downIds.equals("")) {
|
|
|
+ String[] split = downIds.split("/");
|
|
|
+ for (int m = 0; m < split.length; m++) {
|
|
|
+ downIDs.add(split[m]);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
if (queryTO.getItemName().equals("水费缴纳")) {
|
|
|
- payableInfoWaterService.downloadResult(response, queryTO);
|
|
|
+ payableInfoWaterService.downloadResult(response, queryTO, downIDs);
|
|
|
} else {
|
|
|
- payableInfoService.downloadResult(response, queryTO);
|
|
|
+ payableInfoService.downloadResult(response, queryTO, downIDs);
|
|
|
}
|
|
|
|
|
|
}
|
|
|
@@ -328,7 +316,7 @@ public class PayableInfoController {
|
|
|
String[] split = payableInfoEntity.getNotPayDetail().split("/");
|
|
|
payableInfoEntity.setNotPaySize(split.length);
|
|
|
|
|
|
- // payableInfoEntity.setPayableAccount(payableInfoService.queryPayItemByName(payableInfoEntity.getPaymentItem()));
|
|
|
+ // payableInfoEntity.setPayableAccount(payableInfoService.queryPayItemByName(payableInfoEntity.getPaymentItem()));
|
|
|
objectList.add(payableInfoEntity);
|
|
|
});
|
|
|
payableInfoService.updateBatchById(objectList);
|
|
|
@@ -396,9 +384,9 @@ public class PayableInfoController {
|
|
|
}
|
|
|
|
|
|
MyStudentNoImportListener studentNoImportListener = new MyStudentNoImportListener();
|
|
|
- EasyExcel.read(file.getInputStream(), StudentNoVO.class, studentNoImportListener).sheet().doRead();
|
|
|
+ EasyExcel.read(file.getInputStream(), StudentNoVO.class, studentNoImportListener).sheet().headRowNumber(4).doRead();
|
|
|
List<StudentNoVO> studentNos = studentNoImportListener.getStudentNoList();
|
|
|
-
|
|
|
+ studentNos.remove(studentNos.size() - 1);
|
|
|
List<DeletePayableInfoTO> alreadyPayList = new ArrayList<>();
|
|
|
studentNos.forEach(studentNo -> {
|
|
|
StudentNoVO student = studentNo;
|
|
|
@@ -406,33 +394,35 @@ public class PayableInfoController {
|
|
|
QueryWrapper<PayableInfoWaterEntity> wrapper = new QueryWrapper<>();
|
|
|
wrapper.eq(student.getStudentNo() != null, "student_no", student.getStudentNo());
|
|
|
wrapper.eq(student.getPaymentItem() != null, "payment_item", student.getPaymentItem());
|
|
|
+ wrapper.eq(student.getStudentName() != null, "student_name", student.getStudentName());
|
|
|
+ wrapper.eq(student.getPayMonth() != null, "pay_month", student.getPayMonth());
|
|
|
|
|
|
PayableInfoWaterEntity one = payableInfoWaterService.getOne(wrapper);
|
|
|
if (one != null) {
|
|
|
boolean alreadyPay = payOrderService.isAlreadyPay(one.getStudentNo(), one.getPaymentItem(), one.getPayMonth(), null, null, null);
|
|
|
if (alreadyPay) {
|
|
|
- DeletePayableInfoTO to = new DeletePayableInfoTO();
|
|
|
- BeanUtils.copyProperties(one, to);
|
|
|
- to.setMsg("学生已缴费，删除失败！");
|
|
|
- alreadyPayList.add(to);
|
|
|
+ throw new RRException(BizCodeEnume.DATA_IS_EXIST, "删除失败，" + student.getStudentName() + " "
|
|
|
+ + student.getStudentNo() + " 已完成 " + student.getPayMonth() + " 时间段的 " + student.getPaymentItem() + " 的缴费，请核对完毕之后重新导入删除");
|
|
|
+ } else {
|
|
|
+ payableInfoService.removeById(one);
|
|
|
}
|
|
|
- payableInfoWaterService.removeById(one);
|
|
|
}
|
|
|
} else {
|
|
|
QueryWrapper<PayableInfoEntity> wrapper = new QueryWrapper<>();
|
|
|
wrapper.eq(student.getStudentNo() != null, "student_no", student.getStudentNo());
|
|
|
wrapper.eq(student.getPaymentItem() != null, "payment_item", student.getPaymentItem());
|
|
|
+ wrapper.eq(student.getStudentName() != null, "student_name", student.getStudentName());
|
|
|
+ wrapper.eq(student.getPayMonth() != null, "years", student.getPayMonth());
|
|
|
|
|
|
PayableInfoEntity one = payableInfoService.getOne(wrapper);
|
|
|
if (one != null) {
|
|
|
- boolean alreadyPay = payOrderService.isAlreadyPay(one.getStudentNo(), one.getPaymentItem(), one.getYears(), one.getNotPaySize(), null, null);
|
|
|
+ boolean alreadyPay = payOrderService.isAlreadyPay(one.getStudentNo(), one.getPaymentItem(), one.getYears(), null, null, null);
|
|
|
if (alreadyPay) {
|
|
|
- DeletePayableInfoTO to = new DeletePayableInfoTO();
|
|
|
- BeanUtils.copyProperties(one, to);
|
|
|
- to.setMsg("学生已缴费，删除失败！");
|
|
|
- alreadyPayList.add(to);
|
|
|
+ throw new RRException(BizCodeEnume.DATA_IS_EXIST, "删除失败，" + student.getStudentName() + " "
|
|
|
+ + student.getStudentNo() + " 已完成 " + student.getPayMonth() + " 时间段的 " + student.getPaymentItem() + " 的缴费，请核对完毕之后重新导入删除");
|
|
|
+ } else {
|
|
|
+ payableInfoService.removeById(one);
|
|
|
}
|
|
|
- payableInfoService.removeById(one);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
@@ -557,7 +547,6 @@ public class PayableInfoController {
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* 查询用户的基本信息
|
|
|
*
|
|
|
@@ -768,19 +757,22 @@ public class PayableInfoController {
|
|
|
|
|
|
/**
|
|
|
* 通过缴费项目查询项目的所有缴费明细
|
|
|
+ *
|
|
|
* @param itemName
|
|
|
* @return
|
|
|
*/
|
|
|
@GetMapping("queryInfoAllDetailByItem")
|
|
|
- public CommonResult<T> queryInfoAllDetailByItem( @RequestParam("itemName") String itemName){
|
|
|
+ public CommonResult<T> queryInfoAllDetailByItem(@RequestParam("itemName") String itemName) {
|
|
|
+ String realDetailStr = "";
|
|
|
String detailStr = "";
|
|
|
- if (itemName.equals("水费缴纳")){
|
|
|
+ if (itemName.equals("水费缴纳")) {
|
|
|
detailStr = itemName;
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
QueryWrapper<PayableInfoEntity> info = new QueryWrapper<>();
|
|
|
|
|
|
info.eq("payment_item", itemName)
|
|
|
- .last("limit 1");
|
|
|
+ .orderByDesc("pay_create_time")
|
|
|
+ .last("limit 1");
|
|
|
PayableInfoEntity one = payableInfoService.getOne(info);
|
|
|
if (one == null) {
|
|
|
return CommonResult.ok().setResult("该项目暂无缴费明细");
|
|
|
@@ -790,25 +782,48 @@ public class PayableInfoController {
|
|
|
if (one.getNotMustMoney() != null && !one.getNotMustMoney().equals("")) {
|
|
|
String[] split = one.getNotMustMoney().split("/");
|
|
|
for (int i = 0; i < split.length; i++) {
|
|
|
- notMustMoney += split[i].split(":")[0] +"/";
|
|
|
+ notMustMoney += split[i].split(":")[0] + "/";
|
|
|
}
|
|
|
}
|
|
|
if (one.getMustMoney() != null) {
|
|
|
String[] split = one.getMustMoney().split("/");
|
|
|
for (int i = 0; i < split.length; i++) {
|
|
|
- mustMoney += split[i].split(":")[0] +"/";
|
|
|
+ mustMoney += split[i].split(":")[0] + "/";
|
|
|
}
|
|
|
}
|
|
|
if (notMustMoney.equals("")) {
|
|
|
- mustMoney = mustMoney.endsWith("/") == true ? mustMoney.substring(0,mustMoney.length()-1) :mustMoney;
|
|
|
+ mustMoney = mustMoney.endsWith("/") == true ? mustMoney.substring(0, mustMoney.length() - 1) : mustMoney;
|
|
|
detailStr = mustMoney;
|
|
|
- }else {
|
|
|
- notMustMoney = notMustMoney.endsWith("/") == true ? notMustMoney.substring(0,notMustMoney.length()-1) :notMustMoney;
|
|
|
+ } else {
|
|
|
+ notMustMoney = notMustMoney.endsWith("/") == true ? notMustMoney.substring(0, notMustMoney.length() - 1) : notMustMoney;
|
|
|
detailStr = mustMoney + notMustMoney;
|
|
|
}
|
|
|
|
|
|
+ QueryWrapper<BankItemDetail> bankWrapper = new QueryWrapper<>();
|
|
|
+ bankWrapper.eq("item_name", itemName);
|
|
|
+ List<BankItemDetail> bankList = bankItemDetailService.list(bankWrapper);
|
|
|
+ String bankDetailStr = "";
|
|
|
+ if (bankList.size() > 0) {
|
|
|
+ for (int m = 0; m < bankList.size(); m++) {
|
|
|
+ bankDetailStr += bankList.get(m).getBankDetailStr() + "/";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ bankDetailStr = bankDetailStr.endsWith("/") == true ? bankDetailStr.substring(0, bankDetailStr.length() - 1) : bankDetailStr;
|
|
|
+ //已经关联的明细
|
|
|
+ String[] split = bankDetailStr.split("/");
|
|
|
+ List<String> payDetailList = new ArrayList<>(Arrays.asList(split));
|
|
|
+ //全部明细
|
|
|
+ String[] detailStrArr = detailStr.split("/");
|
|
|
+ List<String> allDetailList = new ArrayList<>(Arrays.asList(detailStrArr));
|
|
|
+ allDetailList.removeAll(payDetailList);
|
|
|
+ if (allDetailList.size() > 0) {
|
|
|
+ for (int a = 0; a < allDetailList.size(); a++) {
|
|
|
+ realDetailStr += allDetailList.get(a) + "/";
|
|
|
+ }
|
|
|
+ }
|
|
|
+ realDetailStr = realDetailStr.endsWith("/") == true ? realDetailStr.substring(0, realDetailStr.length() - 1) : realDetailStr;
|
|
|
}
|
|
|
|
|
|
- return CommonResult.ok().setResult(detailStr);
|
|
|
+ return CommonResult.ok().setResult(realDetailStr);
|
|
|
}
|
|
|
}
|
Bingo