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-26 10:12:41 +08:00
parent 75706dbaa9
commit 8cdc3dd263
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.ParseException; import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
/** /**
@@ -140,7 +141,7 @@ public class PaymentController {
.notExists("select 1 from payment_to_order where order_id = orders.id and state = 0") .notExists("select 1 from payment_to_order where order_id = orders.id and state = 0")
.eq(Orders::getFee, payment.getFee()) .eq(Orders::getFee, payment.getFee())
.eq(Orders::getPayType, 0) .eq(Orders::getPayType, 0)
.ge(Orders::getOrderTime, DateUtils.addDays(payment.getCtime(),-1)) .ge(Orders::getOrderTime, payment.getCtime())
.le(Orders::getOrderTime, DateUtils.addDays(payment.getCtime(),3)) .le(Orders::getOrderTime, DateUtils.addDays(payment.getCtime(),3))
.orderByAsc(Orders::getOrderTime)); .orderByAsc(Orders::getOrderTime));
return R.ok().put("data",ordersList); return R.ok().put("data",ordersList);
@@ -154,7 +155,13 @@ public class PaymentController {
paymentService.updateById(payment); paymentService.updateById(payment);
paymentToOrderService.save(pto); paymentToOrderService.save(pto);
ordersService.updatePoint(pto.getOrderId()); ordersService.updatePoint(pto.getOrderId());
ordersService.update(new LambdaUpdateWrapper<Orders>().set(Orders::getUseFlag,1).eq(Orders::getId,pto.getOrderId())); Orders orders = ordersService.getById(pto.getOrderId());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM");
if(!sdf.format(payment.getCtime()).equals(sdf.format(orders.getOrderTime()))){
orders.setOrderTime(payment.getCtime());
}
orders.setUseFlag(1);
ordersService.updateById(orders);
return R.ok(); return R.ok();
} }