|
|
|
@ -120,6 +120,19 @@ public class OrderServiceImpl implements OrderService { |
|
|
|
qumap.put("bcin",tsarr); |
|
|
|
} |
|
|
|
} |
|
|
|
// 商品服务费类型
|
|
|
|
String chargeType = (String) qumap.get("getOrderList"); |
|
|
|
if(chargeType!=null){ |
|
|
|
somap.put("charges_type",chargeType); |
|
|
|
List<OrderGoodsDetail> tsolist = orderGoodsDetailMapper.searchOrderGoodsInKey(somap); |
|
|
|
if(tsolist!=null){ |
|
|
|
List tsarr=new ArrayList(); |
|
|
|
for(OrderGoodsDetail ogd:tsolist){ |
|
|
|
tsarr.add(ogd.getBatchcode()); |
|
|
|
} |
|
|
|
qumap.put("bcin",tsarr); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// 重新组合筛选条件
|
|
|
|
List<Order> orderList=orderMapper.getOrderList(qumap,starrs,limit); |
|
|
|
|