From 7ce3c22d4bf8fae793379fed1ca22c05e822ce7e Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期一, 22 十二月 2025 11:24:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java | 4 ++--
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCommissionTransactionFlowServiceImpl.java | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/vo/ProfitPageListVo.java | 4 ++--
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBigGiftPackageOrderServiceImpl.java | 20 ++++++++++++++++----
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPhysicalGoodsOrderController.java | 14 +++++++++-----
ruoyi-system/src/main/java/com/ruoyi/system/vo/PromotionPageListVo.java | 2 +-
6 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPhysicalGoodsOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPhysicalGoodsOrderController.java
index b0771e0..1b3f9d6 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPhysicalGoodsOrderController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPhysicalGoodsOrderController.java
@@ -3,6 +3,7 @@
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.R;
@@ -23,6 +24,7 @@
import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.math.BigDecimal;
import java.net.URLEncoder;
import java.util.List;
@@ -59,11 +61,13 @@
@GetMapping(value = "/detail/{id}")
public R<TPhysicalGoodsOrder> detail(@PathVariable("id") Long id) {
TPhysicalGoodsOrder order = tPhysicalGoodsOrderService.getById(id);
- TPhysicalGoods goods = tPhysicalGoodsService.getById(order.getPhysicalGoodsId());
- order.setPhysicalGoodsName(goods.getName());
- order.setPhysicalGoodsCover(goods.getCoverImage());
- order.setPhysicalGoodsPrice(goods.getTotalPrice());
- order.setPhysicalGoodsIntro(goods.getIntroduction());
+ String physicalGoods = order.getPhysicalGoods();
+ JSONObject jsonObject = JSONObject.parseObject(physicalGoods);
+// TPhysicalGoods goods = tPhysicalGoodsService.getById(order.getPhysicalGoodsId());
+ order.setPhysicalGoodsName(jsonObject.getString("name"));
+ order.setPhysicalGoodsCover(jsonObject.getString("coverImage"));
+ order.setPhysicalGoodsPrice(new BigDecimal(jsonObject.getString("totalPrice")).setScale(2, BigDecimal.ROUND_HALF_UP));
+ order.setPhysicalGoodsIntro(jsonObject.getString("introduction"));
return R.ok(order);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java
index 9291154..01b01b4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java
@@ -101,7 +101,7 @@
BigDecimal totalOne = giftPackageOrders.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TBigGiftPackageOrder::getPaymentPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
promotionPageListVo.setTotalConsume(totalOne);
- BigDecimal totalIncome = flows.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TCommissionTransactionFlow::getCommissionAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ Integer totalIncome = flows.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).mapToInt(TCommissionTransactionFlow::getCommissionAmount).sum();
promotionPageListVo.setTotalIncome(totalIncome);
BigDecimal totalSettledIncome = settlements.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TIntegralSettlement::getTotalSettlementIntegral).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -132,7 +132,7 @@
BigDecimal totalOne = giftPackageOrders.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TBigGiftPackageOrder::getPaymentPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
promotionPageListVo.setTotalConsume(totalOne);
- BigDecimal totalIncome = flows.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TCommissionTransactionFlow::getCommissionAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
+ Integer totalIncome = flows.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).mapToInt(TCommissionTransactionFlow::getCommissionAmount).sum();
promotionPageListVo.setTotalIncome(totalIncome);
BigDecimal totalSettledIncome = settlements.stream().filter(e -> e.getAppUserId().equals(promotionPageListVo.getUserId())).map(TIntegralSettlement::getTotalSettlementIntegral).reduce(BigDecimal.ZERO, BigDecimal::add);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBigGiftPackageOrderServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBigGiftPackageOrderServiceImpl.java
index d5603e5..4fe3a5d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBigGiftPackageOrderServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBigGiftPackageOrderServiceImpl.java
@@ -82,12 +82,18 @@
List<Integer> companyId = tBigGiftPackageOrders.stream().map(TBigGiftPackageOrder::getCompanyId).collect(Collectors.toList());
List<TCompany> tCompanies = companyMapper.selectBatchIds(companyId);
tBigGiftPackageOrders.forEach(tBigGiftPackageOrder -> {
- tBigGiftPackageOrder.setCompanyName(tCompanies.stream().filter(tCompany -> tCompany.getId().equals(tBigGiftPackageOrder.getCompanyId())).findFirst().get().getName());
+ TCompany tCompany1 = tCompanies.stream().filter(tCompany -> tCompany.getId().equals(tBigGiftPackageOrder.getCompanyId())).findFirst().orElse(null);
+ if(tCompany1!=null){
+ tBigGiftPackageOrder.setCompanyName(tCompany1.getName());
+ }
});
List<Integer> goodsIds = tBigGiftPackageOrders.stream().map(TBigGiftPackageOrder::getBigGiftPackageId).collect(Collectors.toList());
List<TBigGiftPackage> bigGiftPackages = bigGiftPackageMapper.selectBatchIds(goodsIds);
tBigGiftPackageOrders.forEach(tBigGiftPackageOrder -> {
- tBigGiftPackageOrder.setBigGiftPackageName(bigGiftPackages.stream().filter(tBigGiftPackage -> tBigGiftPackage.getId().equals(tBigGiftPackageOrder.getBigGiftPackageId())).findFirst().get().getName());
+ TBigGiftPackage bigGiftPackage = bigGiftPackages.stream().filter(tBigGiftPackage -> tBigGiftPackage.getId().equals(tBigGiftPackageOrder.getBigGiftPackageId())).findFirst().orElse(null);
+ if(bigGiftPackage!=null){
+ tBigGiftPackageOrder.setBigGiftPackageName(bigGiftPackage.getName());
+ }
});
}
@@ -108,12 +114,18 @@
List<Integer> companyId = tBigGiftPackageOrders.stream().map(TBigGiftPackageOrder::getCompanyId).collect(Collectors.toList());
List<TCompany> tCompanies = companyMapper.selectBatchIds(companyId);
tBigGiftPackageOrders.forEach(tBigGiftPackageOrder -> {
- tBigGiftPackageOrder.setCompanyName(tCompanies.stream().filter(tCompany -> tCompany.getId().equals(tBigGiftPackageOrder.getCompanyId())).findFirst().get().getName());
+ TCompany tCompany1 = tCompanies.stream().filter(tCompany -> tCompany.getId().equals(tBigGiftPackageOrder.getCompanyId())).findFirst().orElse(null);
+ if(tCompany1!=null){
+ tBigGiftPackageOrder.setCompanyName(tCompany1.getName());
+ }
});
List<Integer> goodsIds = tBigGiftPackageOrders.stream().map(TBigGiftPackageOrder::getBigGiftPackageId).collect(Collectors.toList());
List<TBigGiftPackage> bigGiftPackages = bigGiftPackageMapper.selectBatchIds(goodsIds);
tBigGiftPackageOrders.forEach(tBigGiftPackageOrder -> {
- tBigGiftPackageOrder.setBigGiftPackageName(bigGiftPackages.stream().filter(tBigGiftPackage -> tBigGiftPackage.getId().equals(tBigGiftPackageOrder.getBigGiftPackageId())).findFirst().get().getName());
+ TBigGiftPackage bigGiftPackage = bigGiftPackages.stream().filter(tBigGiftPackage -> tBigGiftPackage.getId().equals(tBigGiftPackageOrder.getBigGiftPackageId())).findFirst().orElse(null);
+ if(bigGiftPackage!=null){
+ tBigGiftPackageOrder.setBigGiftPackageName(bigGiftPackage.getName());
+ }
});
}
return tBigGiftPackageOrders ;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCommissionTransactionFlowServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCommissionTransactionFlowServiceImpl.java
index 15fe997..2045deb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCommissionTransactionFlowServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCommissionTransactionFlowServiceImpl.java
@@ -197,7 +197,7 @@
flow.setOrderId(orderId);
flow.setOrderType(orderType);
flow.setOrderPrice(orderPrice);
- flow.setCommissionAmount(commissionAmount);
+ flow.setCommissionAmount(commissionAmount.intValue());
flow.setCreateTime(LocalDateTime.now());
save(flow);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProfitPageListVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProfitPageListVo.java
index b29af9a..cf6f4d6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProfitPageListVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/ProfitPageListVo.java
@@ -37,9 +37,9 @@
@ApiModelProperty("推广员收益")
@Excel(name = "推广员收益", orderNum = "6", width = 20)
- private BigDecimal saleProfit=BigDecimal.ZERO;
+ private Integer saleProfit=0;
@ApiModelProperty("合伙人收益")
@Excel(name = "合伙人收益", orderNum = "7", width = 20)
- private BigDecimal partnerProfit=BigDecimal.ZERO;
+ private Integer partnerProfit=0;
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/PromotionPageListVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/PromotionPageListVo.java
index c3c6bac..f4609fa 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/PromotionPageListVo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/PromotionPageListVo.java
@@ -62,7 +62,7 @@
@ApiModelProperty(value = "合计收益")
@Excel(name = "合计收益", width = 20)
- private BigDecimal totalIncome;
+ private Integer totalIncome;
@ApiModelProperty(value = "已结算收益")
@Excel(name = "已结算收益", width = 20)
--
Gitblit v1.7.1