|
@@ -31,6 +31,7 @@ import java.util.List;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
import ma.glasnost.orika.MapperFacade;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
+import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
@@ -134,7 +135,9 @@ public class UserDeliverOrderMgrController extends BaseApiController {
|
|
|
for (OrderDeliverItemVO itemVO : itemList) {
|
|
|
for (UserDeliverOrderItem item : orderItems) {
|
|
|
if (itemVO.getDeliveryFlowId().equals(item.getDeliveryFlowId())) {
|
|
|
- itemVO.getItems().add(item);
|
|
|
+ UserDeliverOrderItem flowItem = new UserDeliverOrderItem();
|
|
|
+ BeanUtils.copyProperties(item, flowItem);
|
|
|
+ itemVO.getItems().add(flowItem);
|
|
|
}
|
|
|
}
|
|
|
}
|