autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-13 14:30:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 结算金额

Browse Source
This commit is contained in:
Guoqs
2025-08-14 10:14:01 +08:00
parent 3f47868cb0
commit 0d36d79f34
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
jsowell-admin/src/main/java/com/jsowell/web/controller/pile/OrderBasicInfoController.java
View File

@@ -12,6 +12,7 @@ import com.jsowell.common.enums.BusinessType;
import com.jsowell.common.enums.ykc.ReturnCodeEnum; import com.jsowell.common.enums.ykc.ReturnCodeEnum;
import com.jsowell.common.exception.BusinessException; import com.jsowell.common.exception.BusinessException;
import com.jsowell.common.response.RestApiResponse; import com.jsowell.common.response.RestApiResponse;
import com.jsowell.common.util.YKCUtils;
import com.jsowell.common.util.poi.ExcelUtil; import com.jsowell.common.util.poi.ExcelUtil;
import com.jsowell.pile.domain.OrderBasicInfo; import com.jsowell.pile.domain.OrderBasicInfo;
import com.jsowell.pile.domain.PileMerchantInfo; 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.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import java.math.BigDecimal;
import java.util.List; import java.util.List;
/** /**
@@ -134,7 +136,10 @@ public class OrderBasicInfoController extends BaseController {
// 将结算金额改为实收金额 // 将结算金额改为实收金额
if (CollectionUtils.isNotEmpty(list)) { if (CollectionUtils.isNotEmpty(list)) {
for (OrderListVO orderListVO : 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<OrderListVO> util = new ExcelUtil<OrderListVO>(OrderListVO.class); ExcelUtil<OrderListVO> util = new ExcelUtil<OrderListVO>(OrderListVO.class);