|
@@ -2060,17 +2060,20 @@ public class AdminCustomerController {
|
|
|
for (SalesOrder salesOrder : common.getSalesOrderList()) {
|
|
|
if (salesOrder.getSalesOrderItemList().size() > 0) {
|
|
|
for (SalesOrderItem salesOrderItem : salesOrder.getSalesOrderItemList()) {
|
|
|
- customer.setRelationBackLogisticsCompany(common.getRelationBackLogisticsCompany());
|
|
|
- customer.setRelationBackLogisticsNo(common.getRelationBackLogisticsNo());
|
|
|
- customer.setRelationSendLogisticsCompany(common.getRelationSendLogisticsCompany());
|
|
|
- customer.setRelationSendLogisticsNo(common.getRelationSendLogisticsNo());
|
|
|
- customer.setRelationBackStatus(String.valueOf(common.getRelationBackStatus()));
|
|
|
- customer.setRelationBackReceiptDate(common.getRelationBackReceiptDate() == null?null:format.format(common.getRelationBackReceiptDate()));
|
|
|
- customer.setSalesPayTime(salesOrder.getSalesPayTime());
|
|
|
- customer.setItemProductName(salesOrderItem.getItemProductName());
|
|
|
- customer.setItemProductColor(salesOrderItem.getItemProductColor());
|
|
|
- customer.setItemNum(String.valueOf(salesOrderItem.getItemNum()));
|
|
|
- customerStatisticalInfoList.add(customer);
|
|
|
+ //将数据copy到新容器
|
|
|
+ CustomerStatisticalInfo customers = new CustomerStatisticalInfo();
|
|
|
+ BeanUtils.copyProperties(customer, customers);
|
|
|
+ customers.setRelationBackLogisticsCompany(common.getRelationBackLogisticsCompany());
|
|
|
+ customers.setRelationBackLogisticsNo(common.getRelationBackLogisticsNo());
|
|
|
+ customers.setRelationSendLogisticsCompany(common.getRelationSendLogisticsCompany());
|
|
|
+ customers.setRelationSendLogisticsNo(common.getRelationSendLogisticsNo());
|
|
|
+ customers.setRelationBackStatus(String.valueOf(common.getRelationBackStatus()));
|
|
|
+ customers.setRelationBackReceiptDate(common.getRelationBackReceiptDate() == null?null:format.format(common.getRelationBackReceiptDate()));
|
|
|
+ customers.setSalesPayTime(salesOrder.getSalesPayTime());
|
|
|
+ customers.setItemProductName(salesOrderItem.getItemProductName());
|
|
|
+ customers.setItemProductColor(salesOrderItem.getItemProductColor());
|
|
|
+ customers.setItemNum(String.valueOf(salesOrderItem.getItemNum()));
|
|
|
+ customerStatisticalInfoList.add(customers);
|
|
|
}
|
|
|
} else {
|
|
|
customerStatisticalInfoList.add(customer);
|