|
|
@@ -1,7 +1,6 @@
|
|
|
package com.chuanghai.smartschool.tuitionpayment.service.impl;
|
|
|
|
|
|
import com.alibaba.excel.EasyExcel;
|
|
|
-import com.alibaba.excel.util.CollectionUtils;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
@@ -10,7 +9,6 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.chuanghai.smartschool.tuitionpayment.common.exception.BizCodeEnume;
|
|
|
import com.chuanghai.smartschool.tuitionpayment.common.exception.RRException;
|
|
|
-import com.chuanghai.smartschool.tuitionpayment.common.utils.CommonResult;
|
|
|
import com.chuanghai.smartschool.tuitionpayment.common.utils.MyQuery;
|
|
|
import com.chuanghai.smartschool.tuitionpayment.common.utils.PageParam;
|
|
|
import com.chuanghai.smartschool.tuitionpayment.common.utils.PageUtils;
|
|
|
@@ -29,9 +27,11 @@ import com.chuanghai.smartschool.tuitionpayment.service.*;
|
|
|
import com.chuanghai.smartschool.tuitionpayment.to.PayOrderQueryTO;
|
|
|
import com.chuanghai.smartschool.tuitionpayment.utils.MyUtil;
|
|
|
import com.chuanghai.smartschool.tuitionpayment.utils.OutputTxt;
|
|
|
-import com.chuanghai.smartschool.tuitionpayment.vo.*;
|
|
|
+import com.chuanghai.smartschool.tuitionpayment.vo.CreateOrderResultVO;
|
|
|
+import com.chuanghai.smartschool.tuitionpayment.vo.OrderStatusVO;
|
|
|
+import com.chuanghai.smartschool.tuitionpayment.vo.PayInfoDetailVO;
|
|
|
+import com.chuanghai.smartschool.tuitionpayment.vo.PayOrderReceiveVO;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.util.StringUtils;
|
|
|
@@ -40,11 +40,11 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
import java.io.IOException;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.net.URLEncoder;
|
|
|
-import java.time.LocalDate;
|
|
|
import java.time.LocalDateTime;
|
|
|
-import java.time.format.DateTimeFormatter;
|
|
|
import java.time.temporal.ChronoUnit;
|
|
|
-import java.util.*;
|
|
|
+import java.util.Date;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
|
|
|
@Slf4j
|
|
|
@Service("payOrderService")
|
|
|
@@ -179,10 +179,8 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
|
|
|
String payDetial = payOrderReceiveVO.getPayDetail();
|
|
|
String payYear = payOrderReceiveVO.getPayYear();
|
|
|
String orderNotice = payOrderReceiveVO.getOrderNotice();
|
|
|
-
|
|
|
-
|
|
|
String id = payOrderReceiveVO.getId().toString();
|
|
|
- // String payItemType = payOrderReceiveVO.getPayItemType();
|
|
|
+
|
|
|
// 查询用户是否已经缴费
|
|
|
boolean alreadyPay = isAlreadyPay(studentNo, itemName, payYear, payOrderReceiveVO.getNotPaySize());
|
|
|
if (alreadyPay) {
|
|
|
@@ -191,19 +189,15 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
|
|
|
PayableInfoEntity payableInfo = null;
|
|
|
PayableInfoWaterEntity payableInfoWater = null;
|
|
|
String grade = "";
|
|
|
- // String notPayDetail = "";
|
|
|
- // String totalDetail = "";
|
|
|
if (itemName.equals("水费缴纳")) {
|
|
|
payableInfoWater = payableInfoWaterService.getByStudentNo(studentNo, itemName, payYear);
|
|
|
// 获取学生入学年份
|
|
|
grade = payableInfoWater.getGrade();
|
|
|
- // totalDetail = payableInfoWater.getPayAmountDetail();
|
|
|
} else {
|
|
|
// 查询支付金额、被支付用户信息
|
|
|
payableInfo = payableInfoService.getByStudentNo(studentNo, itemName, payYear);
|
|
|
// 获取学生入学年份
|
|
|
grade = payableInfo.getGrade();
|
|
|
- // notPayDetail = payableInfo.getNotPayDetail();
|
|
|
}
|
|
|
|
|
|
Integer currentGrade = MyUtil.calcStudentGrade(Integer.valueOf(grade.trim()));
|
|
|
@@ -249,35 +243,15 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
|
|
|
CreateOrderResultVO createOrderResultVO = new CreateOrderResultVO();
|
|
|
if (payOrderEntity == null) {
|
|
|
createOrderResultVO.setMsg("新创建订单");
|
|
|
-
|
|
|
payOrderEntity = new PayOrderEntity();
|
|
|
-
|
|
|
//判断该订单是否为多次支付
|
|
|
PayInfoDetailVO payInfoDetailVO = new PayInfoDetailVO();
|
|
|
int count = Integer.parseInt(payOrderReceiveVO.getPayCount());
|
|
|
if (count == 1) {
|
|
|
payOrderEntity.setIsParent(Boolean.TRUE);
|
|
|
// payInfoDetailVO = payableInfoController.queryPayDetail(id, itemName, payOrderReceiveVO.getPayDetail());
|
|
|
- } else {
|
|
|
- //获取缴费明细
|
|
|
- // String payDetail = payOrderReceiveVO.getPayDetail();
|
|
|
-
|
|
|
- //判断是否有未支付的明细
|
|
|
-
|
|
|
-// if (!itemName.equals("水费缴纳")) {
|
|
|
-// if (StringUtils.hasText(payInfoDetailVO.getNotMustMoney())) {
|
|
|
-// totalDetail = payInfoDetailVO.getMustMoney() + "/" + payInfoDetailVO.getNotMustMoney();
|
|
|
-// }else {
|
|
|
-// totalDetail = payInfoDetailVO.getMustMoney();
|
|
|
-// }
|
|
|
-// }
|
|
|
-// if (totalDetail.equals(payDetail)) {
|
|
|
-// } else {
|
|
|
-// payOrderEntity.setIsParent(Boolean.FALSE);
|
|
|
-// }
|
|
|
}
|
|
|
payInfoDetailVO = (PayInfoDetailVO) payableInfoController.queryPayInfoDetail(id, itemName, payOrderReceiveVO.getPayDetail()).getData();
|
|
|
-
|
|
|
payOrderEntity.setNotPayDetail(payInfoDetailVO.getNotPayDetail());
|
|
|
|
|
|
payOrderEntity.setOrderNo(generateOrderNo());
|
|
|
@@ -296,6 +270,7 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
|
|
|
payOrderEntity.setPayBank(payItemController.queryPayItemByName(itemName));
|
|
|
//计算助学贷款相关的费用
|
|
|
String payOrderLoan = payOrderReceiveVO.getPayOrderLoan();
|
|
|
+ payOrderLoan = payOrderLoan.equals("") ? "0": payOrderLoan;
|
|
|
BigDecimal orderLoan = BigDecimal.ZERO;
|
|
|
// if (StringUtils.hasText(payOrderLoan)) {
|
|
|
// orderLoan = orderLoan.add(new BigDecimal(payOrderLoan)).setScale(2,BigDecimal.ROUND_HALF_UP);
|
|
|
@@ -309,16 +284,14 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
|
|
|
// 支付金额、被支付用户信息
|
|
|
if (itemName.equals("水费缴纳")) {
|
|
|
//更新对应项目的缴费参数
|
|
|
-
|
|
|
payOrderEntity.setDrom(drom.isEmpty() ? "" : drom);
|
|
|
payOrderEntity.setRealPayAmount(payableInfoWater.getRealPayAmount());
|
|
|
- payOrderEntity.setNowPayAmount(payableInfoWater.getRealPayAmount());
|
|
|
+ //payOrderEntity.setNowPayAmount(payableInfoWater.getRealPayAmount());
|
|
|
payOrderEntity.setStudentName(payableInfoWater.getStudentName());
|
|
|
payOrderEntity.setClassName(payableInfoWater.getClassName());
|
|
|
} else {
|
|
|
- payOrderEntity.setRealPayAmount(payableInfo.getRealPayAmount().subtract(orderLoan).setScale(2, BigDecimal.ROUND_UP));
|
|
|
- System.out.println(payInfoDetailVO.getPayDetailAmount());
|
|
|
- payOrderEntity.setNowPayAmount(payInfoDetailVO.getPayDetailAmount());
|
|
|
+ payOrderEntity.setRealPayAmount(payableInfo.getRealPayAmount());
|
|
|
+ // payOrderEntity.setNowPayAmount(payInfoDetailVO.getPayDetailAmount());
|
|
|
payOrderEntity.setStudentName(payableInfo.getStudentName());
|
|
|
payOrderEntity.setClassName(payableInfo.getClassName());
|
|
|
//更新缴费名单的缴费明细
|
|
|
@@ -329,10 +302,11 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
|
|
|
}
|
|
|
payableInfo.setNotPayDetail(payOrderEntity.getNotPayDetail());
|
|
|
payableInfo.setNotPaySize(payOrderReceiveVO.getNotPaySize());
|
|
|
- // payableInfoService.updateById(payableInfo);
|
|
|
+ // payableInfoService.updateById(payableInfo);
|
|
|
|
|
|
}
|
|
|
BigDecimal parentNowPayDetailAmount = BigDecimal.ZERO;
|
|
|
+ BigDecimal parentOrderLone = BigDecimal.ZERO;
|
|
|
if (count > 1) {
|
|
|
QueryWrapper<PayOrderEntity> wrapper1 = new QueryWrapper<>();
|
|
|
wrapper1.eq("payer_identify", cardNumber);
|
|
|
@@ -343,32 +317,63 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
|
|
|
// wrapper1.orderByAsc("create_time");
|
|
|
// wrapper1.last("limit 1");
|
|
|
PayOrderEntity one = this.getOne(wrapper1);
|
|
|
- payOrderEntity.setParentOrder(one.getOrderNo());
|
|
|
- parentNowPayDetailAmount = parentNowPayDetailAmount.add(one.getNowPayAmount()).setScale(2,BigDecimal.ROUND_HALF_UP);
|
|
|
+ if (one != null) {
|
|
|
+
|
|
|
+ List<PayOrderEntity> payOrderList = queryAllOrderByParent(one.getOrderNo(), new PageParam()).getList();
|
|
|
+ for (int i = 0; i< payOrderList.size(); i++) {
|
|
|
+ System.out.println(payOrderList.get(i));
|
|
|
+ // parentOrderLone = parentOrderLone.add(payOrderList.get(i).getPayOrderLoan()).setScale(2,BigDecimal.ROUND_HALF_UP);
|
|
|
+ parentNowPayDetailAmount = parentNowPayDetailAmount.add(payOrderList.get(i).getNowPayAmount()).setScale(2,BigDecimal.ROUND_HALF_UP);
|
|
|
+ }
|
|
|
+
|
|
|
+ System.out.println(parentOrderLone);
|
|
|
+ // parentNowPayDetailAmount = parentNowPayDetailAmount.add(parentOrderLone);
|
|
|
+ System.out.println(parentNowPayDetailAmount);
|
|
|
+ System.out.println(payInfoDetailVO+"------------1111111111111111111111");
|
|
|
+ BigDecimal notPayDetailAmount = payInfoDetailVO.getNotPayDetailAmount();
|
|
|
+ // parentOrderLone = one.getPayOrderLoan().setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
+ payOrderEntity.setParentOrder(one.getOrderNo());
|
|
|
+ // parentNowPayDetailAmount = (parentNowPayDetailAmount.add(one.getNowPayAmount())).setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
+ System.out.println(payOrderEntity.getRealPayAmount()+ " --- "+parentNowPayDetailAmount +" "+notPayDetailAmount);
|
|
|
+ payOrderEntity.setNowPayAmount(payOrderEntity.getRealPayAmount().setScale(2, BigDecimal.ROUND_HALF_UP).subtract(parentNowPayDetailAmount).setScale(2, BigDecimal.ROUND_HALF_UP)
|
|
|
+ .subtract(notPayDetailAmount));
|
|
|
+ }
|
|
|
|
|
|
+ }else{
|
|
|
+ payOrderEntity.setNowPayAmount(payInfoDetailVO.getPayDetailAmount().subtract(payOrderEntity.getPayOrderLoan().setScale(2,BigDecimal.ROUND_HALF_UP)));
|
|
|
}
|
|
|
+ // System.out.println(payOrderEntity.getNowPayAmount()+" sjdhfuhsbdf getNowPayAmount");
|
|
|
//校验订单的支付金额是否异常
|
|
|
- int i = 1;
|
|
|
- if (itemName.equals("水费缴纳")) {
|
|
|
- i = payOrderEntity.getNowPayAmount().compareTo(payableInfoWater.getRealPayAmount());
|
|
|
- }else {
|
|
|
- i = payOrderEntity.getNowPayAmount().add(payOrderEntity.getPayOrderLoan()).add(payInfoDetailVO.getNotPayDetailAmount()).compareTo(payableInfo.getRealPayAmount());
|
|
|
+ Boolean flag = Boolean.TRUE;
|
|
|
+ //前端实付金额
|
|
|
+ BigDecimal realPayAmount = payOrderReceiveVO.getNowRealPayAmount().setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
|
+ // payInfoDetailVO.setPayDetailAmount(payOrderEntity.getNowPayAmount());
|
|
|
+ if (itemName.equals("水费缴纳")) {
|
|
|
+ flag = payOrderEntity.getNowPayAmount().compareTo(payableInfoWater.getRealPayAmount()) == 0? Boolean.TRUE : Boolean.FALSE;
|
|
|
+ } else {
|
|
|
+ // System.out.println(payOrderReceiveVO);
|
|
|
+ // System.out.println(payInfoDetailVO);
|
|
|
+ // System.out.println(payOrderEntity);
|
|
|
+ // System.out.println(payOrderEntity.getPayOrderLoan()+" getPayOrderLoan");
|
|
|
+ BigDecimal aBoolean = payOrderEntity.getNowPayAmount().add(payOrderEntity.getPayOrderLoan()).add(payInfoDetailVO.getNotPayDetailAmount());
|
|
|
+
|
|
|
+ BigDecimal bBoolean = (payableInfo.getRealPayAmount().setScale(2, BigDecimal.ROUND_HALF_UP)).subtract(parentOrderLone).subtract(parentNowPayDetailAmount);
|
|
|
+ flag = aBoolean.compareTo(bBoolean) == 0 ? Boolean.TRUE : Boolean.FALSE;
|
|
|
//i = payOrderEntity.getNowPayAmount().add(payOrderEntity.getPayOrderLoan()).compareTo(payableInfo.getRealPayAmount());
|
|
|
+ System.out.println(payOrderEntity.getNowPayAmount()+" payOrderEntity");
|
|
|
+ System.out.println(aBoolean+"---------- "+bBoolean);
|
|
|
+ System.out.println(2+" "+flag);
|
|
|
+
|
|
|
}
|
|
|
- //前端实付金额
|
|
|
- BigDecimal realPayAmount = payInfoDetailVO.getRealPayAmount().setScale(2,BigDecimal.ROUND_HALF_UP);
|
|
|
- if (count > 1){
|
|
|
- payOrderEntity.setNowPayAmount(payOrderEntity.getNowPayAmount().subtract(parentNowPayDetailAmount).setScale(2,BigDecimal.ROUND_HALF_UP));
|
|
|
- }
|
|
|
- if (realPayAmount == payOrderEntity.getNowPayAmount()) {
|
|
|
- i = 1;
|
|
|
+ System.out.println(realPayAmount);
|
|
|
+ System.out.println(payOrderEntity.getNowPayAmount());
|
|
|
+ if (!(realPayAmount.compareTo(payOrderEntity.getNowPayAmount()) == 0)) {
|
|
|
+ flag = Boolean.FALSE;
|
|
|
+ System.out.println(3+" "+flag);
|
|
|
}
|
|
|
-
|
|
|
- if (i != 0) {
|
|
|
+ if (!flag) {
|
|
|
throw new RRException(BizCodeEnume.PAY_AMOUNT_ERROR, "支付金额异常。");
|
|
|
- //检测该订单是否异常，订单异常自动发送 订单异常微校通知
|
|
|
- // wechatController.sendException(itemName);
|
|
|
}
|
|
|
|
|
|
/* 首次订单支付成功之后如果还有未支付的 状态为 3 无未支付的状态为 2
|
|
|
@@ -377,6 +382,7 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
|
|
|
检测该订单是否异常，订单异常自动发送 订单异常微校通知
|
|
|
wechatController.sendException(itemName);
|
|
|
*/
|
|
|
+
|
|
|
this.save(payOrderEntity);
|
|
|
|
|
|
|
|
|
@@ -422,7 +428,6 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
|
|
|
@Override
|
|
|
public OrderStatusVO queryOrderStatus(String cardNumber, String orderNo) {
|
|
|
OrderStatusVO orderStatusVO = queryOrderStatus(orderNo);
|
|
|
-
|
|
|
if (!orderStatusVO.getPayerId().equals(cardNumber)) {
|
|
|
throw new RRException(BizCodeEnume.NO_PERMISSION);
|
|
|
}
|
|
|
@@ -449,6 +454,7 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
|
|
|
LocalDateTime localDateTime = new MyUtil().changeTime(orderdate);
|
|
|
payOrder.setFinishTime(localDateTime);
|
|
|
payOrder.setStatus(PayStatus.ALREADY_PAY.getCode());
|
|
|
+ payableInfoController.updatePayinfoByOrder(orderNo);
|
|
|
this.updateById(payOrder);
|
|
|
}
|
|
|
} else if (PayMethod.JXNXS_PAY.getCode().equals(payOrder.getPayMethod())) {
|
|
|
@@ -463,6 +469,7 @@ public class PayOrderServiceImpl extends ServiceImpl<PayOrderDao, PayOrderEntity
|
|
|
payOrder.setStatus(PayStatus.ALREADY_PAY.getCode());
|
|
|
// TODO 完成时间应该改成实际完成支付时间
|
|
|
payOrder.setFinishTime(LocalDateTime.now());
|
|
|
+ payableInfoController.updatePayinfoByOrder(orderNo);
|
|
|
this.updateById(payOrder);
|
|
|
}
|
|
|
}
|
Bingo