From 44a8377b13e30df474360408d90d955f3ac42599 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 31 十二月 2024 09:01:49 +0800
Subject: [PATCH] 修改
---
manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java | 6 +++++-
manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java | 2 +-
manage/src/main/java/com/jilongda/manage/utils/LoginInfoUtil.java | 2 +-
3 files changed, 7 insertions(+), 3 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 db25427..dfcbdeb 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderAccountingController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.jilongda.common.basic.ApiResult;
import com.jilongda.common.basic.PageInfo;
import com.jilongda.manage.authority.model.SecUser;
@@ -119,6 +120,9 @@
res.setPayType(one1.getName());
res.setProfitMoney(byId.getProfitMoney());
res.setProfitRating(byId.getProfitRating());
+ List<TOrderItems> orderItems = orderItemsService.list(Wrappers.lambdaQuery(TOrderItems.class)
+ .eq(TOrderItems::getOrderId, id));
+ res.setOrderItems(orderItems);
return ApiResult.success(res);
}
@Autowired
@@ -129,7 +133,7 @@
List<TOrderGoods> list = dto.getList();
orderGoodsService.updateBatchById(list);
TOrder byId = orderService.getById(dto.getId());
- byId.setConfirmPayType(dto.getPayTypeName());
+ byId.setPayTypeName(dto.getPayTypeName());
byId.setPayMoney(dto.getPayMoney());
byId.setCommissionMoney(dto.getCommission());
byId.setIsAccounting(1);
diff --git a/manage/src/main/java/com/jilongda/manage/utils/LoginInfoUtil.java b/manage/src/main/java/com/jilongda/manage/utils/LoginInfoUtil.java
index fc1f130..f7ec242 100644
--- a/manage/src/main/java/com/jilongda/manage/utils/LoginInfoUtil.java
+++ b/manage/src/main/java/com/jilongda/manage/utils/LoginInfoUtil.java
@@ -18,7 +18,7 @@
public Long getUserId(){
String username = JwtTokenUtils.getUsername();
- SecUser userName = secUserService.getOne(new QueryWrapper<SecUser>().eq("phone", username).eq("isDelete",0));
+ SecUser userName = secUserService.getOne(new QueryWrapper<SecUser>().eq("account", username).eq("isDelete",0));
return userName.getId();
}
diff --git a/manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java b/manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java
index 7ac4ba0..1eb1a5d 100644
--- a/manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java
+++ b/manage/src/main/java/com/jilongda/manage/vo/TOrderAccountVO.java
@@ -48,7 +48,7 @@
@ApiModelProperty(value = "支付方式")
private String payType;
@ApiModelProperty(value = "确认核算后的支付方式和支付金额")
- private List<TOrderItems> confirmPayType;
+ private List<TOrderItems> orderItems;
@ApiModelProperty(value = "实收金额")
private BigDecimal realPayMoney;
@ApiModelProperty(value = "手续费扣除")
--
Gitblit v1.7.1