From a3e9c95eabd6785138e0a8075a1938b0b1f47551 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 30 十二月 2024 14:59:48 +0800
Subject: [PATCH] 小程序
---
manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 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 07d8138..91c8315 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
@@ -3,10 +3,14 @@
import com.jilongda.common.basic.ApiResult;
import com.jilongda.common.basic.PageInfo;
+import com.jilongda.manage.authority.model.SecUser;
+import com.jilongda.manage.authority.service.SecUserService;
+import com.jilongda.manage.dto.AccountDetailDTO;
import com.jilongda.manage.model.*;
import com.jilongda.manage.query.TLineUpQuery;
import com.jilongda.manage.query.TOrderAccountingQuery;
import com.jilongda.manage.service.*;
+import com.jilongda.manage.utils.LoginInfoUtil;
import com.jilongda.manage.vo.TOrderAccountVO;
import com.jilongda.manage.vo.TOrderVO;
import io.swagger.annotations.Api;
@@ -16,6 +20,7 @@
import org.springframework.web.bind.annotation.*;
import java.math.BigDecimal;
+import java.time.LocalDateTime;
import java.util.List;
/**
@@ -31,6 +36,8 @@
@RequestMapping("/t-order-accounting")
public class TOrderAccountingController {
@Autowired
+ private SecUserService secUserService;
+ @Autowired
private TStoreService storeService;
@Autowired
private TOrderService orderService;
@@ -44,6 +51,8 @@
private TOrderGoodsService orderGoodsService;
@Autowired
private SecFeeItemsService feeItemsService;
+ @Autowired
+ private LoginInfoUtil loginInfoUtil;
@ApiOperation(value = "核算订单分页列表")
@PostMapping(value = "/pageList")
public ApiResult<PageInfo<TOrderVO>> pageList(@RequestBody TOrderAccountingQuery query) {
@@ -66,6 +75,7 @@
res.setPhone(byId1.getPhone());
}
}
+ res.setPhone(byId.getPhone());
res.setAge(byId.getAge());
res.setRealName(byId.getRealName());
res.setGender(byId.getGender());
@@ -103,7 +113,20 @@
}
@ApiOperation(value = "确认核算操作")
@GetMapping(value = "/confirm")
- public ApiResult confirm() {
+ public ApiResult confirm(@RequestBody AccountDetailDTO dto) {
+ List<TOrderGoods> list = dto.getList();
+ orderGoodsService.updateBatchById(list);
+ TOrder byId = orderService.getById(dto.getId());
+ byId.setPayTypeName(dto.getPayTypeName());
+ byId.setPayTypeName(dto.getPayTypeName());
+ byId.setPayMoney(dto.getPayMoney());
+ byId.setCommissionMoney(dto.getCommission());
+ byId.setIsAccounting(1);
+ Long userId = loginInfoUtil.getUserId();
+ SecUser byId1 = secUserService.getById(userId);
+ byId.setAccountingName(byId1.getNickName());
+ byId.setAccountingTime(LocalDateTime.now());
+ orderService.updateById(byId);
return ApiResult.success();
}
}
--
Gitblit v1.7.1