|
@@ -28,6 +28,7 @@ import java.math.BigDecimal;
|
|
|
import java.math.RoundingMode;
|
|
import java.math.RoundingMode;
|
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
import java.util.List;
|
|
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 缴费订单
|
|
* 缴费订单
|
|
@@ -363,6 +364,52 @@ public class PayOrderController {
|
|
|
return CommonResult.ok().setResult(orderViewVOList);
|
|
return CommonResult.ok().setResult(orderViewVOList);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 根据cardNumber 查询用户所交的项目
|
|
|
|
|
+ * @param cardNumber
|
|
|
|
|
+ * @param
|
|
|
|
|
+ * @param status
|
|
|
|
|
+ * @return
|
|
|
|
|
+ */
|
|
|
|
|
+ @GetMapping("queryOrderItem")
|
|
|
|
|
+ public CommonResult<T> queryOrderItem(@RequestHeader("card_number") String cardNumber,
|
|
|
|
|
+ @RequestParam("status") String status){
|
|
|
|
|
+
|
|
|
|
|
+ List<String> itemNameList = new ArrayList<>();
|
|
|
|
|
+ QueryWrapper<PayOrderEntity> wrapper = new QueryWrapper<>();
|
|
|
|
|
+ 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());
|
|
|
|
|
+ });
|
|
|
|
|
+ List uniqueStr = itemNameList.stream().distinct().collect(Collectors.toList());
|
|
|
|
|
+
|
|
|
|
|
+ return CommonResult.ok().setResult(uniqueStr);
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
|
|
+ /**
|
|
|
|
|
+ * 根据项目查询订单年度
|
|
|
|
|
+ * @param cardNumber
|
|
|
|
|
+ * @param itemName
|
|
|
|
|
+ * @return
|
|
|
|
|
+ */
|
|
|
|
|
+ @GetMapping("queryYearByItem")
|
|
|
|
|
+ public CommonResult<T> queryYearByItem( @RequestHeader("card_number") String cardNumber,
|
|
|
|
|
+ @RequestParam("itemName") String itemName){
|
|
|
|
|
+ QueryWrapper<PayOrderEntity> wrapper = new QueryWrapper<>();
|
|
|
|
|
+ List<String> yearList = new ArrayList<>();
|
|
|
|
|
+ wrapper.eq(StringUtils.hasText(itemName),"pay_item", itemName)
|
|
|
|
|
+ .eq(StringUtils.hasText(cardNumber), "pay_for_identify", cardNumber);
|
|
|
|
|
+ List<PayOrderEntity> orderList = payOrderService.list(wrapper);
|
|
|
|
|
+ orderList.forEach(order->{
|
|
|
|
|
+ yearList.add(order.getPayYear());
|
|
|
|
|
+ });
|
|
|
|
|
+ List uniqueStr = yearList.stream().distinct().collect(Collectors.toList());
|
|
|
|
|
+
|
|
|
|
|
+ return CommonResult.ok().setResult(uniqueStr);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|