From 2338f0a18ce10e4162f4c9142a6829b5ab950e47 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 十二月 2024 19:42:58 +0800
Subject: [PATCH] 修改
---
manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java | 43 +++++++++++++++++++++++--------------------
1 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java b/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
index 94ff402..07d8138 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
@@ -42,6 +42,8 @@
private TOptometryDetailService optometryDetailService;
@Autowired
private TOrderGoodsService orderGoodsService;
+ @Autowired
+ private SecFeeItemsService feeItemsService;
@ApiOperation(value = "核算订单分页列表")
@PostMapping(value = "/pageList")
public ApiResult<PageInfo<TOrderVO>> pageList(@RequestBody TOrderAccountingQuery query) {
@@ -57,7 +59,6 @@
public ApiResult<TOrderAccountVO> detail(Integer id) {
TOrderAccountVO res = new TOrderAccountVO();
TOrder byId = orderService.getById(id);
- TOrderAccounting one = orderAccountingService.lambdaQuery().eq(TOrderAccounting::getOrderId, id).one();
if (byId.getUserId()!=null){
TAppUser byId1 = appUserService.getById(byId.getUserId());
if(byId1!=null){
@@ -73,35 +74,37 @@
res.setOptometryDetails(list);
List<TOrderGoods> orderGoods = orderGoodsService.lambdaQuery()
.eq(TOrderGoods::getOrderId, id).list();
- BigDecimal bigDecimal = new BigDecimal("0");
+ BigDecimal goodsMoney = new BigDecimal("0");
+ BigDecimal costMoney = new BigDecimal("0");
+ BigDecimal constConfirm = new BigDecimal("0");
for (TOrderGoods orderGood : orderGoods) {
- bigDecimal =bigDecimal.add(orderGood.getGoodsMoney());
+ goodsMoney =goodsMoney.add(orderGood.getGoodsMoney());
+ costMoney=costMoney.add(orderGood.getCost()==null?new BigDecimal("0"):orderGood.getCost());
+ constConfirm=constConfirm.add(orderGood.getConstConfirm()==null?new BigDecimal("0"):orderGood.getConstConfirm());
}
res.setOrderGoods(orderGoods);
TStore byId1 = storeService.getById(byId.getStoreId());
res.setStoreName(byId1.getName());
- res.setOrderMoney(bigDecimal);
+ res.setOrderMoney(goodsMoney);
res.setCouponMoney(byId.getCouponMoney());
res.setPayMoney(byId.getPayMoney());
-// res.setPayType();
-// res.setRealPayMoney();
-// res.setCommission();
-// res.setProfitMoney();
-// res.setProfitRating();
-
-
-
+ res.setPayType(byId.getPayTypeName());
+ res.setRealPayMoney(byId.getPayMoney());
+ SecFeeItems one1 = feeItemsService.lambdaQuery().eq(SecFeeItems::getName, byId.getPayTypeName())
+ .one();
+ BigDecimal percent = one1.getPercent();
+ BigDecimal bigDecimal1 = byId.getPayMoney().multiply(percent).setScale(2, BigDecimal.ROUND_DOWN);
+ res.setCommission(bigDecimal1);
+ if (byId.getIsAccounting()==1){
+ res.setProfitMoney(byId.getPayMoney().subtract(bigDecimal1).subtract(constConfirm));
+ res.setProfitRating(res.getProfitMoney().divide(byId.getPayMoney(),2, BigDecimal.ROUND_DOWN));
+ }
return ApiResult.success(res);
}
@ApiOperation(value = "确认核算操作")
- @PostMapping(value = "/confirm")
- public ApiResult confirm(@RequestBody TOrderAccountingQuery query) {
- if (StringUtils.hasLength(query.getStartTime())){
- query.setStartTime(query.getStartTime()+" 00:00:00");
- query.setEndTime(query.getEndTime()+" 23:59:59");
- }
- PageInfo<TOrderVO> res = orderAccountingService.pageList(query);
- return ApiResult.success(res);
+ @GetMapping(value = "/confirm")
+ public ApiResult confirm() {
+ return ApiResult.success();
}
}
--
Gitblit v1.7.1