|
|
@@ -58,11 +58,11 @@ public class PayOrderController {
|
|
|
*/
|
|
|
@PostMapping("/{studentNo}/create")
|
|
|
public CommonResult<List<CreateOrderResultVO>> createPayOrder(@RequestHeader("card_number") String cardNumber,
|
|
|
- @RequestBody JSONObject jsonObject) {
|
|
|
+ @RequestBody JSONObject jsonObject) {
|
|
|
|
|
|
PayOrderReceiveVO payOrderReceiveVO = JSONObject.toJavaObject(jsonObject, PayOrderReceiveVO.class);
|
|
|
|
|
|
- List<CreateOrderResultVO> resultVOList = payOrderService.createOrder(cardNumber,payOrderReceiveVO);
|
|
|
+ List<CreateOrderResultVO> resultVOList = payOrderService.createOrder(cardNumber, payOrderReceiveVO);
|
|
|
|
|
|
return CommonResult.ok().setResult(resultVOList);
|
|
|
}
|
|
|
@@ -76,7 +76,7 @@ public class PayOrderController {
|
|
|
*/
|
|
|
@PostMapping("/{studentNo}/receiveOrder")
|
|
|
public CommonResult<T> receiveOrder(@RequestHeader("card_number") String cardNumber,
|
|
|
- @RequestBody JSONObject jsonObject ){
|
|
|
+ @RequestBody JSONObject jsonObject) {
|
|
|
PayOrderReceiveVO payOrderReceiveVO = JSONObject.toJavaObject(jsonObject, PayOrderReceiveVO.class);
|
|
|
List<OrderReceiveTO> orderReceiveTOS = payOrderService.receiveOrder(cardNumber, payOrderReceiveVO);
|
|
|
return CommonResult.ok().setResult(orderReceiveTOS);
|
|
|
@@ -260,7 +260,7 @@ public class PayOrderController {
|
|
|
|
|
|
|
|
|
/**
|
|
|
- * 通过订单编号查询缴费订单详情
|
|
|
+ * 通过订单编号查询缴费订单详情 查看订单详情 【用户端】
|
|
|
*
|
|
|
* @param orderNo 订单编号
|
|
|
* @return
|
|
|
@@ -276,42 +276,42 @@ public class PayOrderController {
|
|
|
|
|
|
/**
|
|
|
* 查看全部订单的详情
|
|
|
+ *
|
|
|
* @param cardNumber
|
|
|
* @param pageParam
|
|
|
- * @param status 订单状态
|
|
|
+ * @param status 订单状态
|
|
|
* @return
|
|
|
*/
|
|
|
@GetMapping("/queryAllOrder")
|
|
|
- public CommonResult<PageUtils<PayOrderEntity>> queryAllOrderByParent(@RequestHeader("card_number") String cardNumber,
|
|
|
- PageParam pageParam ,
|
|
|
- @RequestParam("status") String status,
|
|
|
- String itemName, String payYear){
|
|
|
-
|
|
|
- PageUtils page = payOrderService.queryAllOrder(cardNumber, pageParam, status, itemName ,payYear);
|
|
|
+ public CommonResult<PageUtils<PayOrderEntity>> queryAllOrderByParent(@RequestHeader("card_number") String cardNumber,
|
|
|
+ PageParam pageParam,
|
|
|
+ @RequestParam("status") String status,
|
|
|
+ String itemName, String payYear) {
|
|
|
|
|
|
+ PageUtils page = payOrderService.queryAllOrder(cardNumber, pageParam, status, itemName, payYear);
|
|
|
return CommonResult.ok().setResult(page);
|
|
|
}
|
|
|
|
|
|
@GetMapping("/updateOrderDetail")
|
|
|
- public void updateOrderDetail(String orderNo){
|
|
|
+ public void updateOrderDetail(String orderNo) {
|
|
|
QueryWrapper<PayOrderEntity> wrapper = new QueryWrapper<>();
|
|
|
- wrapper.eq("order_no",orderNo);
|
|
|
+ wrapper.eq("order_no", orderNo);
|
|
|
PayOrderEntity payOrderEntity = this.payOrderService.getOne(wrapper);
|
|
|
String payItem = payOrderEntity.getPayItem();
|
|
|
BigDecimal notPayAmount = BigDecimal.ZERO;
|
|
|
BigDecimal payAmount = BigDecimal.ZERO.setScale(2, RoundingMode.HALF_UP);
|
|
|
- if (payItem.equals("水费缴纳")){
|
|
|
+ if (payItem.equals("水费缴纳")) {
|
|
|
QueryWrapper<PayableInfoWaterEntity> wrapper1 = new QueryWrapper<>();
|
|
|
- wrapper1.eq("student_no",payOrderEntity.getPayForIdentify())
|
|
|
+ wrapper1.eq("student_no", payOrderEntity.getPayForIdentify())
|
|
|
.eq("student_name", payOrderEntity.getStudentName())
|
|
|
.eq("pay_month", payOrderEntity.getPayYear());
|
|
|
PayableInfoWaterEntity payableInfoWaterEntity = payableInfoWaterService.getOne(wrapper1);
|
|
|
payOrderEntity.setRealPayAmount(payableInfoWaterEntity.getRealPayAmount());
|
|
|
payOrderEntity.setPayDetail(payableInfoWaterEntity.getPayAmountDetail());
|
|
|
payOrderEntity.setNowPayAmount(payableInfoWaterEntity.getRealPayAmount());
|
|
|
- }else {
|
|
|
+ } else {
|
|
|
QueryWrapper<PayableInfoEntity> wrapper1 = new QueryWrapper<>();
|
|
|
- wrapper1.eq("student_no",payOrderEntity.getPayForIdentify())
|
|
|
+ wrapper1.eq("student_no", payOrderEntity.getPayForIdentify())
|
|
|
.eq("student_name", payOrderEntity.getStudentName())
|
|
|
.eq("years", payOrderEntity.getPayYear());
|
|
|
PayableInfoEntity payableInfoEntity = payableInfoService.getOne(wrapper1);
|
|
|
@@ -323,14 +323,14 @@ public class PayOrderController {
|
|
|
payOrderEntity.setNotPayDetail(payableInfoEntity.getNotPayDetail());
|
|
|
String[] notPayDetail = payableInfoEntity.getNotPayDetail().split("/");
|
|
|
|
|
|
- for (int i=0; i< notPayDetail.length; i++) {
|
|
|
+ for (int i = 0; i < notPayDetail.length; i++) {
|
|
|
notPayAmount = notPayAmount.add(new BigDecimal(notPayDetail[i].split(":")[1]));
|
|
|
}
|
|
|
}
|
|
|
if (!payableInfoEntity.getPayDetail().isEmpty()) {
|
|
|
payOrderEntity.setPayDetail(payableInfoEntity.getPayDetail());
|
|
|
String[] payDetail = payableInfoEntity.getPayDetail().split("/");
|
|
|
- for (int i=0; i< payDetail.length; i++) {
|
|
|
+ for (int i = 0; i < payDetail.length; i++) {
|
|
|
payAmount = payAmount.add(new BigDecimal(payDetail[i].split(":")[1]));
|
|
|
}
|
|
|
}
|
|
|
@@ -341,17 +341,18 @@ public class PayOrderController {
|
|
|
|
|
|
/**
|
|
|
* 根据订单编号查询步骤详情
|
|
|
+ *
|
|
|
* @param orderNo
|
|
|
* @param secondOrderNo
|
|
|
* @return
|
|
|
*/
|
|
|
@GetMapping("showStepDetail")
|
|
|
- public CommonResult<List<OrderViewVO>> showStepDetail(String orderNo, String secondOrderNo){
|
|
|
- List<OrderViewVO> orderViewVOList = new ArrayList<>();
|
|
|
+ public CommonResult<List<OrderViewVO>> showStepDetail(String orderNo, String secondOrderNo) {
|
|
|
+ List<OrderViewVO> orderViewVOList = new ArrayList<>();
|
|
|
QueryWrapper<PayOrderEntity> wrapper = new QueryWrapper<>();
|
|
|
wrapper.in("order_no", orderNo, secondOrderNo);
|
|
|
List<PayOrderEntity> orderList = payOrderService.list(wrapper);
|
|
|
- orderList.forEach(order->{
|
|
|
+ orderList.forEach(order -> {
|
|
|
OrderViewVO orderViewVO = new OrderViewVO();
|
|
|
orderViewVO.setItemName(order.getPayItem());
|
|
|
orderViewVO.setPayDetail(order.getPayDetail());
|
|
|
@@ -365,25 +366,32 @@ public class PayOrderController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 根据cardNumber 查询用户所交的项目
|
|
|
+ * 根据cardNumber 查询用户所交的项目及时间
|
|
|
+ *
|
|
|
* @param cardNumber
|
|
|
* @param
|
|
|
* @param status
|
|
|
* @return
|
|
|
*/
|
|
|
@GetMapping("queryOrderItem")
|
|
|
- public CommonResult<T> queryOrderItem(@RequestHeader("card_number") String cardNumber,
|
|
|
- @RequestParam("status") String status){
|
|
|
+ public CommonResult<OrderQueryVO> queryOrderItem(@RequestHeader("card_number") String cardNumber,
|
|
|
+ @RequestParam("status") String status) {
|
|
|
+
|
|
|
+ List<OrderQueryVO> orderQueryVOList = new ArrayList<>();
|
|
|
|
|
|
- List<String> itemNameList = new ArrayList<>();
|
|
|
QueryWrapper<PayOrderEntity> wrapper = new QueryWrapper<>();
|
|
|
- wrapper.eq(StringUtils.hasText(status),"status", status)
|
|
|
+ wrapper.eq(StringUtils.hasText(status), "status", status)
|
|
|
.eq(StringUtils.hasText(cardNumber), "pay_for_identify", cardNumber);
|
|
|
List<PayOrderEntity> orderList = payOrderService.list(wrapper);
|
|
|
- orderList.forEach(order->{
|
|
|
- itemNameList.add(order.getPayItem());
|
|
|
+ orderList.forEach(order -> {
|
|
|
+ OrderQueryVO orderQueryVO = new OrderQueryVO();
|
|
|
+ orderQueryVO.setText(order.getPayItem());
|
|
|
+ orderQueryVO.setValue(order.getPayItem());
|
|
|
+ List<YearVo> lists = queryYearByItem(cardNumber, status, order.getPayItem());
|
|
|
+ orderQueryVO.setChildren(lists);
|
|
|
+ orderQueryVOList.add(orderQueryVO);
|
|
|
});
|
|
|
- List uniqueStr = itemNameList.stream().distinct().collect(Collectors.toList());
|
|
|
+ List uniqueStr = orderQueryVOList.stream().distinct().collect(Collectors.toList());
|
|
|
|
|
|
return CommonResult.ok().setResult(uniqueStr);
|
|
|
}
|
|
|
@@ -391,24 +399,33 @@ public class PayOrderController {
|
|
|
|
|
|
/**
|
|
|
* 根据项目查询订单年度
|
|
|
+ *
|
|
|
* @param cardNumber
|
|
|
* @param itemName
|
|
|
+ * @param status
|
|
|
* @return
|
|
|
*/
|
|
|
@GetMapping("queryYearByItem")
|
|
|
- public CommonResult<T> queryYearByItem( @RequestHeader("card_number") String cardNumber,
|
|
|
- @RequestParam("itemName") String itemName){
|
|
|
+ public List<YearVo> queryYearByItem(String cardNumber,
|
|
|
+ String status,
|
|
|
+ @RequestParam("itemName") String itemName) {
|
|
|
+ List<List<YearVo>> yearLists = new ArrayList<>();
|
|
|
QueryWrapper<PayOrderEntity> wrapper = new QueryWrapper<>();
|
|
|
- List<String> yearList = new ArrayList<>();
|
|
|
- wrapper.eq(StringUtils.hasText(itemName),"pay_item", itemName)
|
|
|
+ List<YearVo> yearList = new ArrayList<>();
|
|
|
+ wrapper.eq(StringUtils.hasText(itemName), "pay_item", itemName)
|
|
|
+ .eq("status", status)
|
|
|
.eq(StringUtils.hasText(cardNumber), "pay_for_identify", cardNumber);
|
|
|
List<PayOrderEntity> orderList = payOrderService.list(wrapper);
|
|
|
- orderList.forEach(order->{
|
|
|
- yearList.add(order.getPayYear());
|
|
|
+ orderList.forEach(order -> {
|
|
|
+ YearVo yearVo = new YearVo();
|
|
|
+ yearVo.setText(order.getPayYear());
|
|
|
+ yearVo.setValue(order.getPayYear());
|
|
|
+ yearList.add(yearVo);
|
|
|
+
|
|
|
});
|
|
|
- List uniqueStr = yearList.stream().distinct().collect(Collectors.toList());
|
|
|
+ // List uniqueStr = yearList.stream().distinct().collect(Collectors.toList());
|
|
|
|
|
|
- return CommonResult.ok().setResult(uniqueStr);
|
|
|
+ return yearList;
|
|
|
}
|
|
|
}
|
|
|
|