|  | @@ -420,6 +420,7 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          Map<Integer, BigDecimal> groupPurchasePriceMap = goodies.stream().collect(Collectors.toMap(Goods::getId, Goods::getGroupPurchasePrice));
 | 
	
		
			
				|  |  |          BigDecimal goodsTotalPrice = goodies.stream().map(Goods::getGroupPurchasePrice).reduce(BigDecimal.ZERO, BigDecimal::add);
 | 
	
		
			
				|  |  | +        Map<Integer, GoodsType> goodsTypeMap = goodies.stream().collect(Collectors.toMap(Goods::getId, Goods::getType));
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          AccountType accountType = sysPaymentConfigService.checkAccountType(PaymentChannelEnum.valueOf(order.getPaymentChannel()), order.getMerNos());
 | 
	
		
			
				|  |  |  
 | 
	
	
		
			
				|  | @@ -453,6 +454,13 @@ public class ReplacementInstrumentActivityServiceImpl extends BaseServiceImpl<In
 | 
	
		
			
				|  |  |              sellOrder.setSellTime(order.getCreateTime());
 | 
	
		
			
				|  |  |              sellOrder.setCreateIme(new Date());
 | 
	
		
			
				|  |  |              sellOrder.setUpdateTime(new Date());
 | 
	
		
			
				|  |  | +            if (goodsTypeMap.get(sellOrder.getGoodsId()).equals(GoodsType.INSTRUMENT)) {
 | 
	
		
			
				|  |  | +                sellOrder.setType(SellTypeEnum.INSTRUMENT);
 | 
	
		
			
				|  |  | +            } else if (goodsTypeMap.get(sellOrder.getGoodsId()).equals(GoodsType.ACCESSORIES)) {
 | 
	
		
			
				|  |  | +                sellOrder.setType(SellTypeEnum.ACCESSORIES);
 | 
	
		
			
				|  |  | +            } else {
 | 
	
		
			
				|  |  | +                sellOrder.setType(SellTypeEnum.OTHER);
 | 
	
		
			
				|  |  | +            }
 | 
	
		
			
				|  |  |              i++;
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  |          if (sellOrders.size() > 0) {
 |