angelo
/
java-retail-app
3
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: angelo:39f890e754f85c473c21462eb42b458fb8abf1c8
Branches Tags
angelo:master
angelo:online
angelo:test
angelo:dev
angelo:feat_shared_reg
..
compare: angelo:4225e554d499d0c54cdb0ae2068b038c07c17502
Branches Tags
angelo:online
angelo:test
angelo:dev
angelo:feat_shared_reg
angelo:master

No commits in common. "39f890e754f85c473c21462eb42b458fb8abf1c8" and "4225e554d499d0c54cdb0ae2068b038c07c17502" have entirely different histories.
39f890e754 ... 4225e554d4

1 changed files with 12 additions and 18 deletions
Show Stats Expand all files Collapse all files

30
bd-business/bd-business-sale/src/main/java/com/hzs/retail/sale/controller/service/impl/RetailOrderServiceImpl.java
View File

@ -789,10 +789,8 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
// 订单商品拆分数据 // 订单商品拆分数据
List<SaOrderWares> orderWaresList = new ArrayList<>(); List<SaOrderWares> orderWaresList = new ArrayList<>();
// 订单商品拆分map（key：商品主键，value：商品数量） // 订单商品map（key：商品主键-商品价格，value：商品数量）
Map<Integer, BigDecimal> orderWaresMap = new HashMap<>(); Map<String, BigDecimal> orderWaresMap = new HashMap<>();
// 订单商品价格拆分map（key：商品主键，value：商品价格）
Map<Integer, BigDecimal> orderWaresPriceMap = new HashMap<>();
// 商品销量数据 // 商品销量数据
List<WaresNumberParam> waresNumberList = new ArrayList<>(); List<WaresNumberParam> waresNumberList = new ArrayList<>();
// 商品销量map（key：商品主键，value：商品数量） // 商品销量map（key：商品主键，value：商品数量）
@ -814,18 +812,14 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
// 指定商品拆分 并且 非赠品 // 指定商品拆分 并且 非赠品
if (boxProductList.contains(saOrderItems.getWareCode()) if (boxProductList.contains(saOrderItems.getWareCode())
&& EYesNo.NO.getIntValue() == saOrderItems.getIsGift()) { && EYesNo.NO.getIntValue() == saOrderItems.getIsGift()) {
// 商品数量 BigDecimal boxNum = saOrderItems.getWaresBoxNum().multiply(new BigDecimal(saOrderItems.getWaresQuantity()));
BigDecimal waresQuantity = new BigDecimal(saOrderItems.getWaresQuantity()); // key: 商品ID-商品价格（产品价格*产品数量）
// 盒数 = 商品上传盒数 * 商品数量 String key = saOrderItems.getPkWares() + "-" + (saOrderItems.getPrice().multiply(new BigDecimal(saOrderItems.getQuantity())));
BigDecimal boxNum = saOrderItems.getWaresBoxNum().multiply(waresQuantity); if (orderWaresMap.containsKey(key)) {
orderWaresMap.put(saOrderItems.getPkWares(), boxNum); BigDecimal tmpBoxNum = orderWaresMap.get(key).add(boxNum);
// 价格 = 商品上传价格 * 商品数量，不存在直接放入，存在则进行累加 orderWaresMap.put(key, tmpBoxNum);
BigDecimal waresPrice = saOrderItems.getPrice().multiply(waresQuantity);
if (orderWaresPriceMap.containsKey(saOrderItems.getPkWares())) {
BigDecimal tmpWaresPrice = orderWaresPriceMap.get(saOrderItems.getPkWares());
orderWaresPriceMap.put(saOrderItems.getPkWares(), tmpWaresPrice.add(waresPrice));
} else { } else {
orderWaresPriceMap.put(saOrderItems.getPkWares(), waresPrice); orderWaresMap.put(key, boxNum);
} }
waresLimitMap.merge(saOrderItems.getPkWares(), saOrderItems.getWaresQuantity(), Integer::sum); waresLimitMap.merge(saOrderItems.getPkWares(), saOrderItems.getWaresQuantity(), Integer::sum);
@ -837,11 +831,11 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
if (orderWaresMap.size() > 0) { if (orderWaresMap.size() > 0) {
// 处理订单商品拆分数据 // 处理订单商品拆分数据
for (Integer key : orderWaresMap.keySet()) { for (String key : orderWaresMap.keySet()) {
SaOrderWares saOrderWares = SaOrderWares.builder() SaOrderWares saOrderWares = SaOrderWares.builder()
.pkOrder(saOrderExt.getPkId()) .pkOrder(saOrderExt.getPkId())
.pkWares(key) .pkWares(Integer.parseInt(key.split("-")[0]))
.waresPrice(orderWaresPriceMap.get(key)) .waresPrice(new BigDecimal(key.split("-")[1]))
.waresQuantity(orderWaresMap.get(key)) .waresQuantity(orderWaresMap.get(key))
.build(); .build();
saOrderWares.setPkCreator(saOrderExt.getPkCreator()); saOrderWares.setPkCreator(saOrderExt.getPkCreator());