zm/finance
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

报表

Browse Source
This commit is contained in:
wuchunlei
2026-01-19 10:17:58 +08:00
parent 59c70ae026
commit cf3852a0ee
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zmzm/finance/common/controller/PaymentController.java
View File

@@ -138,6 +138,7 @@ public class PaymentController {
Long.parseLong(params.get("limit").toString())), new LambdaQueryWrapper<Orders>()
.notExists("select 1 from payment_to_order where order_id = orders.id and state = 0")
.eq(Orders::getFee, payment.getFee())
.eq(Orders::getPayType, 0)
.ge(Orders::getOrderTime, DateUtils.addDays(payment.getCtime(),-1))
.le(Orders::getOrderTime, DateUtils.addDays(payment.getCtime(),3))
.orderByAsc(Orders::getOrderTime));
@@ -385,6 +386,7 @@ public class PaymentController {
public R checkoffByAddOrder(@RequestBody Map<String,Object> params) throws ParseException {
List<Map<String,Object>> list = (List<Map<String,Object>>)params.get("list");
for (Map<String,Object> map : list) {
Payment payment = paymentService.getById(Integer.parseInt(map.get("paymentId").toString()));
FinanceOrder financeOrder = new FinanceOrder();
financeOrder.setTel(map.get("tel").toString());
financeOrder.setCome(map.get("come").toString());
@@ -397,6 +399,7 @@ public class PaymentController {
financeOrder.setOrderMoney(new BigDecimal(map.get("orderMoney").toString()));
financeOrder.setDistrictMoney(new BigDecimal(map.get("districtMoney").toString()));
financeOrder.setRealMoney(new BigDecimal(map.get("realMoney").toString()));
financeOrder.setCreateTime(payment.getCtime());
if (StringUtils.isNotEmpty(map.get("startTime").toString())){
financeOrder.setStartTime(DateUtils.parseDate(map.get("startTime").toString(),new String[]{"yyyy-MM-dd"}));
}
@@ -418,7 +421,6 @@ public class PaymentController {
pto.setPaymentId(Integer.parseInt(map.get("paymentId").toString()));
pto.setOrderId(orders.getId());
paymentToOrderService.save(pto);
Payment payment = paymentService.getById(Integer.parseInt(map.get("paymentId").toString()));
payment.setCheckoff(2);
paymentService.updateById(payment);
ordersService.updatePoint(orders.getId());
@@ -451,6 +453,7 @@ public class PaymentController {
financeOrder.setOrderMoney(new BigDecimal(map.get("orderMoney").toString()));
financeOrder.setDistrictMoney(new BigDecimal(map.get("districtMoney").toString()));
financeOrder.setRealMoney(new BigDecimal(map.get("realMoney").toString()));
financeOrder.setCreateTime(payment.getCtime());
if (StringUtils.isNotEmpty(map.get("endTime").toString())){
financeOrder.setStartTime(payment.getCtime());
financeOrder.setEndTime(DateUtils.addDays(payment.getCtime(),Integer.parseInt(map.get("endTime").toString())));

9
src/main/java/com/zmzm/finance/common/controller/StatisticsController.java
View File

@@ -69,6 +69,11 @@ public class StatisticsController {
map.put("surplus",new BigDecimal(totalPoint.get("totalPoint").toString()).add(diff==null?BigDecimal.ZERO:new BigDecimal(diff.get("diff").toString())));
return R.ok().putData("map",map);
}
//天医币明细导出
@RequestMapping("/pointInfoExport")
public R pointInfoExport(@RequestBody Map<String,Object> params){
return R.ok();
}
//vip
@RequestMapping("/vipStatistics")
@@ -189,7 +194,7 @@ public class StatisticsController {
List<Map<String,Object>> list = new ArrayList<>();
if(orders.getSource()==0){
Map<String,Object> taihuClass = customerTaihuClassService.getMap(new MPJLambdaWrapper<TCustomerTaihuClass>()
.leftJoin("t_customer_apply_curriculum t1 on (t1.customerOid=t.customerOid and t1.curriculumOid=t.taiHuClassOid and t.description like concat('%',t1.curriculumID,'%'))")
.leftJoin("t_customer_apply_curriculum t1 on t.description like concat('%',t1.curriculumID,'%')")
.eq("t1.oid", orders.getOrderOldId())
.apply("t1.valid=1 and t1.status = '50'")
.select("if(t1.point>0,t1.point,t1.money) fee,DATE_FORMAT(t.startDate, '%Y-%m-%d %H:%i:%s') startDate,t.studyDays"));
@@ -201,7 +206,7 @@ public class StatisticsController {
}else {
map.put("startTime",taihuClass.get("startDate"));
map.put("endTime",sdfday.format(DateUtils.addDays(DateUtils.parseDate(taihuClass.get("startDate").toString(),new String[]{"yyyy-MM-dd HH:mm:ss"}),
Integer.parseInt(taihuClass.get("studyDays").toString()))));
Integer.parseInt(taihuClass.get("studyDays")==null?"0":taihuClass.get("studyDays").toString()))));
}
list.add(map);
}else if (orders.getSource()==1){