From 0d36d79f34019c805844df6ffa313bccb9eba9f2 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 14 Aug 2025 10:14:01 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E7=BB=93=E7=AE=97=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/pile/OrderBasicInfoController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java index 68a39ee45..ba38b698e 100644 --- a/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java +++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java @@ -12,6 +12,7 @@ import com.jsowell.common.enums.BusinessType; import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.exception.BusinessException; import com.jsowell.common.response.RestApiResponse; +import com.jsowell.common.util.YKCUtils; import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.PileMerchantInfo; @@ -33,6 +34,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.math.BigDecimal; import java.util.List; /** @@ -134,7 +136,10 @@ public class OrderBasicInfoController extends BaseController { // 将结算金额改为实收金额 if (CollectionUtils.isNotEmpty(list)) { for (OrderListVO orderListVO : list) { - orderListVO.setSettleAmount(String.valueOf(orderListVO.getActualReceivedAmount())); + // orderListVO.setSettleAmount(String.valueOf(orderListVO.getActualReceivedAmount())); + BigDecimal settleAmount = new BigDecimal(orderListVO.getSettleAmount()); + BigDecimal decimal = YKCUtils.getMinBigDecimal(settleAmount, orderListVO.getActualReceivedAmount()); + orderListVO.setSettleAmount(decimal.toString()); } } ExcelUtil util = new ExcelUtil(OrderListVO.class);