## 注册、升级上传盒数,预处理分拆数据调整;
This commit is contained in:
		
							parent
							
								
									e6040a085a
								
							
						
					
					
						commit
						b3b204f80f
					
				| 
						 | 
				
			
			@ -826,14 +826,12 @@ public class RetailOrderServiceImpl implements IRetailOrderService {
 | 
			
		|||
            // 指定商品拆分 并且 非赠品
 | 
			
		||||
            if (boxProductList.contains(saOrderItems.getWareCode())
 | 
			
		||||
                    && EYesNo.NO.getIntValue() == saOrderItems.getIsGift()) {
 | 
			
		||||
                // 商品数量
 | 
			
		||||
                BigDecimal waresQuantity = new BigDecimal(saOrderItems.getWaresQuantity());
 | 
			
		||||
                // 盒数 = 商品上传盒数 * 商品数量
 | 
			
		||||
                BigDecimal boxNum = saOrderItems.getWaresBoxNum().multiply(waresQuantity);
 | 
			
		||||
                BigDecimal boxNum = saOrderItems.getWaresBoxNum().multiply(new BigDecimal(saOrderItems.getWaresQuantity()));
 | 
			
		||||
                orderWaresMap.put(saOrderItems.getPkWares(), boxNum);
 | 
			
		||||
 | 
			
		||||
                // 价格 = 产品上传价格 * 产品数量 * 商品数量,不存在直接放入,存在则进行累加
 | 
			
		||||
                BigDecimal waresPrice = saOrderItems.getPrice().multiply(new BigDecimal(saOrderItems.getQuantity())).multiply(waresQuantity);
 | 
			
		||||
                // 价格 = 产品上传价格 * 产品数量,不存在直接放入,存在则进行累加
 | 
			
		||||
                BigDecimal waresPrice = saOrderItems.getPrice().multiply(new BigDecimal(saOrderItems.getQuantity()));
 | 
			
		||||
                if (orderWaresPriceMap.containsKey(saOrderItems.getPkWares())) {
 | 
			
		||||
                    BigDecimal tmpWaresPrice = orderWaresPriceMap.get(saOrderItems.getPkWares());
 | 
			
		||||
                    orderWaresPriceMap.put(saOrderItems.getPkWares(), tmpWaresPrice.add(waresPrice));
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue