itfirst/sake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fo bo 머지작업 - 오류수정

Browse Source
This commit is contained in:
jazz
2025-12-03 12:04:10 +09:00
parent d0ee787a9e
commit 9cb1d3f419
5 changed files with 119 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/main/java/com/wb/domainserver/domain/gcone/goods/purchs/service/BOPurchsService.java
View File

@@ -436,7 +436,7 @@ public class BOPurchsService {
*/
public Map<String, Object> selectChoiceOrderGoodsList(List<BOGoodsVO> goodsList) {
Map<String, Object> content = new HashMap<>();
AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
BigDecimal slepricAll = BigDecimal.ZERO;
if (!CollectionUtils.isEmpty(goodsList)) {
@@ -505,11 +505,11 @@ public class BOPurchsService {
goodsMap.put("dscntAmt", 0);
goodsMap.put("dscntApplyAmt", subSlepric.intValue());
List<DataMap> goodsDscntDtlsList = new ArrayList<>(); // 상품 할인 내역
List<DataMap> goodsMlgAmtDtlsList = new ArrayList<>(); // 상품 마일리지 적립 내역
List<DataMap> goodsDscntDtlsList = new ArrayList<DataMap>(); // 상품 할인 내역
List<DataMap> goodsMlgAmtDtlsList = new ArrayList<DataMap>(); // 상품 마일리지 적립 내역
Map<String, Object> evtOrderGoodsList = new HashMap<>();
List<BOGoodsVO> remainingGoodsList = new ArrayList<>(goodsList); // 전체 주문 상품 목록
List<BOGoodsVO> remainingGoodsList = new ArrayList<BOGoodsVO>(goodsList); // 전체 주문 상품 목록
while (!remainingGoodsList.isEmpty()) {
evtOrderGoodsList.put("goodsList", remainingGoodsList);
@@ -918,24 +918,21 @@ public class BOPurchsService {
BigDecimal calcMlgAmt = mlgAmt;
BigDecimal mlgAmtByOne = calcMlgAmt.divide(new BigDecimal(qy), BigDecimal.ROUND_FLOOR);
BigDecimal remain = mlgAmt.remainder(new BigDecimal(qy));
goodsMlgAmtDtlsList.add(new DataMap() {{ // 마일리지 적립내역 추가
put("goodsInnb", goodsVO.getGoodsInnb());
put("goodsOptnInnb", goodsVO.getGoodsOptnInnb());
put("qy", qy);
put("mlgAmt", calcMlgAmt.intValue());
put("mlgAmtByOne", mlgAmtByOne.intValue());
put("mlgAccmlCd", mlgAccmlCd) ;
put("aditDscntAmt", mlgAccmlAmt.intValue()) ;
if (mlgMxmmAccmlAmt != null) {
put("mlgMxmmAccmlAmt", mlgMxmmAccmlAmt.intValue());
}
put("remain", remain.intValue());
put("mlgAccmlAmt", mlgAccmlAmt);
put("mlgDtls", mlgDtls);
}});
DataMap goodsmlgAmt = new DataMap();
goodsmlgAmt.put("goodsInnb", goodsVO.getGoodsInnb());
goodsmlgAmt.put("goodsOptnInnb", goodsVO.getGoodsOptnInnb());
goodsmlgAmt.put("qy", qy);
goodsmlgAmt.put("mlgAmt", calcMlgAmt.intValue());
goodsmlgAmt.put("mlgAmtByOne", mlgAmtByOne.intValue());
goodsmlgAmt.put("mlgAccmlCd", mlgAccmlCd) ;
goodsmlgAmt.put("aditDscntAmt", mlgAccmlAmt.intValue()) ;
if (mlgMxmmAccmlAmt != null) {
goodsmlgAmt.put("mlgMxmmAccmlAmt", mlgMxmmAccmlAmt.intValue());
}
goodsmlgAmt.put("remain", remain.intValue());
goodsmlgAmt.put("mlgAccmlAmt", mlgAccmlAmt);
goodsmlgAmt.put("mlgDtls", mlgDtls);
goodsMlgAmtDtlsList.add(goodsmlgAmt);
}
}